Add the ahead/behind test that Carlos suggested

Adds a repo with a more complex topology to test the ahead-behind
count.

diff --git a/tests-clar/resources/twowaymerge.git/HEAD b/tests-clar/resources/twowaymerge.git/HEAD
new file mode 100644 (file)
index 0000000..cb089cd
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master

diff --git a/tests-clar/resources/twowaymerge.git/config b/tests-clar/resources/twowaymerge.git/config
new file mode 100644 (file)
index 0000000..c53d818
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/config
@@ -0,0 +1,5 @@
+[core]
+       repositoryformatversion = 0
+       filemode = true
+       bare = true
+       ignorecase = true

diff --git a/tests-clar/resources/twowaymerge.git/description b/tests-clar/resources/twowaymerge.git/description
new file mode 100644 (file)
index 0000000..498b267
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

diff --git a/tests-clar/resources/twowaymerge.git/info/exclude b/tests-clar/resources/twowaymerge.git/info/exclude
new file mode 100644 (file)
index 0000000..a5196d1
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

diff --git a/tests-clar/resources/twowaymerge.git/objects/0c/8a3f1f3d5f421cf83048c7c73ee3b55a5e0f29 b/tests-clar/resources/twowaymerge.git/objects/0c/8a3f1f3d5f421cf83048c7c73ee3b55a5e0f29
new file mode 100644 (file)
index 0000000..12698af
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/0c/8a3f1f3d5f421cf83048c7c73ee3b55a5e0f29 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/10/2dce8e3081f398e4bdd9fd894dc85ac3ca6a67 b/tests-clar/resources/twowaymerge.git/objects/10/2dce8e3081f398e4bdd9fd894dc85ac3ca6a67
new file mode 100644 (file)
index 0000000..3806ee7
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/10/2dce8e3081f398e4bdd9fd894dc85ac3ca6a67 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/17/7d8634a28e26ec7819284752757ebe01a479d5 b/tests-clar/resources/twowaymerge.git/objects/17/7d8634a28e26ec7819284752757ebe01a479d5
new file mode 100644 (file)
index 0000000..e91e06d
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/17/7d8634a28e26ec7819284752757ebe01a479d5 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/1c/30b88f5f3ee66d78df6520a7de9e89b890818b b/tests-clar/resources/twowaymerge.git/objects/1c/30b88f5f3ee66d78df6520a7de9e89b890818b
new file mode 100644 (file)
index 0000000..57d1a0f
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/1c/30b88f5f3ee66d78df6520a7de9e89b890818b
@@ -0,0 +1,3 @@
+x\ 1\9d\8eM
+Â0\10F]ç\14s\ 1ËÌä§  \88¸\13Üz\82I\9a¶\8ai¤¦÷·^Áå{<>¾TKy4`6\87¶æ\f\9a,y\8f\929j§GJì8\8dÁÇÞb¢\91\\10\1c\8cfõ\965/\r\fÇ^\13\898v¹'ö\81\82ÙË\9cì`S\14Æ\9d\9d\18%[\9bë
+÷T[\83[\a×ú\1a\8a,púüÌsºL\8f6o±Kµ\9c\81´5Ø;\1f\10\8eè\11Õn÷\9b-ÿ= ²ú\ 2\7fÿDÃ
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/1f/4c0311a24b63f6fc209a59a1e404942d4a5006 b/tests-clar/resources/twowaymerge.git/objects/1f/4c0311a24b63f6fc209a59a1e404942d4a5006
new file mode 100644 (file)
index 0000000..99288fd
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/1f/4c0311a24b63f6fc209a59a1e404942d4a5006
@@ -0,0 +1,2 @@
+x\ 1\9dÍ=\ eÂ0\f@aæ\9cÂ\17 ²Mê6\12BlH¬\9c ¿m\11!RqïO¹\ 2ë7¼\17[­\8b\ 2\rrÐ5g°N\92X\1e\83\8bű\e)Eg]ÏDY2\11c R8xã7\9dÛ
+\8fØTáÞÁ­½Rõo8\7f~ò\9c®Ó¢ó\16ºØê\ 5èÔ[\94\ 1\99à\88#¢Ùußjþ;`¼ù\ 2ÔÙ7ó
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83 b/tests-clar/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83
new file mode 100644 (file)
index 0000000..48466ea
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83
@@ -0,0 +1,3 @@
+x\ 1\9d\8eK
+Â0\10@]ç\14s\ 1K&\9d¤  \88¸\13Üz\82\994é\aÛHMïo½\82Û÷àñbY\96©\821tª[Jàb\8elÉ\88µâ¥í4vÉ¡±Lâ³\rì\12'\97\11Õ\9b·´V`B¦\90\ f\17û .
+\12ëÎIöm ï1õZ¨Ç x¯cÙà\19K­ðhà^^ýÂ+\>?2\ f·aªã.M,Ë\15°µtTB\8bpÖ^kuÐc³¦¿\ 3jV_«sFh
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/29/6e56023cdc034d2735fee8c0d85a659d1b07f4 b/tests-clar/resources/twowaymerge.git/objects/29/6e56023cdc034d2735fee8c0d85a659d1b07f4
new file mode 100644 (file)
index 0000000..aa3fccd
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/29/6e56023cdc034d2735fee8c0d85a659d1b07f4 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/31/51880ae2b363f1c262cf98b750c1f169a0d432 b/tests-clar/resources/twowaymerge.git/objects/31/51880ae2b363f1c262cf98b750c1f169a0d432
new file mode 100644 (file)
index 0000000..235d42b
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/31/51880ae2b363f1c262cf98b750c1f169a0d432 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/3b/287f8730c81d0b763c2d294618a5e32b67b4f8 b/tests-clar/resources/twowaymerge.git/objects/3b/287f8730c81d0b763c2d294618a5e32b67b4f8
new file mode 100644 (file)
index 0000000..56ddac5
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/3b/287f8730c81d0b763c2d294618a5e32b67b4f8 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4 b/tests-clar/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4
new file mode 100644 (file)
index 0000000..a8e6581
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4
@@ -0,0 +1,3 @@
+x\ 1\9dν\rÂ0\10@ajOq\v\10\9dcßù"!D\87DË\ 4þK\ 2Â1
+Îþ\84\15h_ñéÅZÊ£AßÛC[s\86aÌÈ\9ep´I³±\89#\8b\e\84lB\9d\ 4\85\9c\11qÈêí×¼4ð\ 3\19\8fZ"\ 5\8d¡Ç(\9cyGF¢\1c¢ød#y«\9dò[\9bë
+÷X[\83[\a×úJÅ/púüÊsºL\8f6o¡\8bµ\9cA\e²èX\84á\88\82¨öºo¶ü7 \92ú\ 2Ô¸Ec
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/49/6d6428b9cf92981dc9495211e6e1120fb6f2ba b/tests-clar/resources/twowaymerge.git/objects/49/6d6428b9cf92981dc9495211e6e1120fb6f2ba
new file mode 100644 (file)
index 0000000..978bc34
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/49/6d6428b9cf92981dc9495211e6e1120fb6f2ba differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/59/b0cf7d74659e1cdb13305319d6d4ce2733c118 b/tests-clar/resources/twowaymerge.git/objects/59/b0cf7d74659e1cdb13305319d6d4ce2733c118
new file mode 100644 (file)
index 0000000..30b507c
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/59/b0cf7d74659e1cdb13305319d6d4ce2733c118 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/6a/b5d28acbf3c3bdff276f7ccfdf29c1520e542f b/tests-clar/resources/twowaymerge.git/objects/6a/b5d28acbf3c3bdff276f7ccfdf29c1520e542f
new file mode 100644 (file)
index 0000000..ff6a386
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/6a/b5d28acbf3c3bdff276f7ccfdf29c1520e542f
@@ -0,0 +1 @@
+x\ 1\9dÎM\ e\820\10@a×=Å\@2ý\1f\12cÜ\99¸õ\ 4eÚ\ 2\86R\83åþâ\15ܾÅ\97ǵ\94¹\81RæÔ¶\94@¢\8a\9c(i$\99uOÉ\f1ö9Ro"\93\r¬9¸à¼x\87-­\rü@¬µcc3;ê-KvHÊ+\879Ùè\ fÁFe¼\b{\9bê\ 6O®­Á£\83{]b +\>¿ò\1aoãܦ}è¸\96+Hm\rz\8f\9aà\8c\84(\8ezl¶ô7 \16ñ\ 5\95\9cF-
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/6c/fca542b55b8b37017e6125a4b8f59a6eae6f11 b/tests-clar/resources/twowaymerge.git/objects/6c/fca542b55b8b37017e6125a4b8f59a6eae6f11
new file mode 100644 (file)
index 0000000..9a969a2
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/6c/fca542b55b8b37017e6125a4b8f59a6eae6f11 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/76/5b32c65d38f04c4f287abda055818ec0f26912 b/tests-clar/resources/twowaymerge.git/objects/76/5b32c65d38f04c4f287abda055818ec0f26912
new file mode 100644 (file)
index 0000000..493bbc0
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/76/5b32c65d38f04c4f287abda055818ec0f26912 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/7b/8c336c45fc6895c1c60827260fe5d798e5d247 b/tests-clar/resources/twowaymerge.git/objects/7b/8c336c45fc6895c1c60827260fe5d798e5d247
new file mode 100644 (file)
index 0000000..19e7ef4
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/7b/8c336c45fc6895c1c60827260fe5d798e5d247
@@ -0,0 +1,3 @@
+x\ 1\9dÎA\ e \10@Q×\9cb.`3\fS(\891îLÜz\82\81B[µÅTz\7fë\15ܾÅÏ\8fe\9e§
+D|¨kJ\10Cß3f\89\12´íȵ\9c\82uÙ   \9bL>YG\1eMÌV½eMK\ 5\9d9¢ÑZ\88\835ÙæHè¥õ¢\13#{¦\9e¥E´J¶:\96\15î±Ô
+·\ 6®åÕϲÀéó\93Çp\19¦:n¡\89e>\836-£sH\fGì\10Õ®ûfM\7f\aÔS}\ 1Z\ 5E²
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/82/bf9a1a10a4b25c1f14c9607b60970705e92545 b/tests-clar/resources/twowaymerge.git/objects/82/bf9a1a10a4b25c1f14c9607b60970705e92545
new file mode 100644 (file)
index 0000000..89b0b9f
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/82/bf9a1a10a4b25c1f14c9607b60970705e92545
@@ -0,0 +1 @@
+x\ 1\9d\8eË\rÂ0\10\ 59»\8am\80hã_Ö\12BÜ\90¸R\81×\9f\ 4\84c\14\9cþ1-p\9d§y\9aPKy4\90R\1fÚ\96\12D\9bG\8cF»ÀJ\19vÉFE>\871#\12q²\8e\rj§ÅÛoim\10bvS\8e\8aYSbEr²\8a¸»Q"eÓ\17\19Ñ{+üÞ\96ºÁ=ÔÖà6Àµ¾bñ+\9c>?ò\9c/ó£-;\ f¡\963\8cÊh\9c¬C\82#\12¢è´g¶ô÷\81XÄ\17ÌyF¤
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/8b/82fb1794cb1c8c7f172ec730a4c2db0ae3e650 b/tests-clar/resources/twowaymerge.git/objects/8b/82fb1794cb1c8c7f172ec730a4c2db0ae3e650
new file mode 100644 (file)
index 0000000..8e9b758
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/8b/82fb1794cb1c8c7f172ec730a4c2db0ae3e650
@@ -0,0 +1,3 @@
+x\ 1\9dν\rÂ0\10@ajOq\v\10ù7\ e\12BtH´Lp¾ó%A8FÁÙ\9f°\ 2íW<=ª¥Ì\r¬õ\87¶æ\fx"Ê\8eØ$\97%1\86dÄcÏDNL\88:Yv\1c=©7®yiÐc
+l\a¤$\8e\b\11\e{\89DÂbOd\82Õ9x+
+·6Õ\15\1eT[\83{\a·úâ\82\v\9c??y\8e×qnÓ\96:ªå\ 2Æ\ 5¯cÔÞÁQ\ fZ«]÷Í\96ÿ\ e¨¢¾7 H\86
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/9a/40a2f11c191f180c47e54b11567cb3c1e89b30 b/tests-clar/resources/twowaymerge.git/objects/9a/40a2f11c191f180c47e54b11567cb3c1e89b30
new file mode 100644 (file)
index 0000000..1de1224
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/9a/40a2f11c191f180c47e54b11567cb3c1e89b30 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/9b/219343610c88a1187c996d0dc58330b55cee28 b/tests-clar/resources/twowaymerge.git/objects/9b/219343610c88a1187c996d0dc58330b55cee28
new file mode 100644 (file)
index 0000000..8b64b43
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/9b/219343610c88a1187c996d0dc58330b55cee28
@@ -0,0 +1,2 @@
+x\ 1\9dÏKj\ 31\10\ 4Ьç\14½óÊFj}Z\82\10¼3\ 4²Ê   ¤VÏÇdFA#ß?\13\92\ Ëz\14\ 5Åu]\97\ eFÓSo" \89JðÆ&\f\82^\98\82\8e\18,9$G\92Eéd)\167|¦&[\a6\94(\18FU"&\8eh<\1e\90\f\ 6¯F\12Éc4AÆ¿>"ZÑQ;m9Û\\ 2;ïKP%1b\199k\899\a3¤G\9fk\83w®½Ãë\ 5nõ£¬i\83çý[îÓuZúüÈ\17®ë\vhã¬"RÞÂY\ 5¥\86C\8f[]þ=0¼I\9b\ 4rK\eÏp\1a\97¶÷óO:Á²õ
+»pÝʯ\r_¾(c\87
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/9f/e06a50f4d1634d6c6879854d01d80857388706 b/tests-clar/resources/twowaymerge.git/objects/9f/e06a50f4d1634d6c6879854d01d80857388706
new file mode 100644 (file)
index 0000000..055de01
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/9f/e06a50f4d1634d6c6879854d01d80857388706 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19 b/tests-clar/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19
new file mode 100644 (file)
index 0000000..cb4d34e
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19
@@ -0,0 +1,3 @@
+x\ 1\9dν\rÂ0\10@ajOq\v\10Ýù7'!D\87DË\ 4öÙ   A$FÁÙ\9f°\ 2íW<=©ó<5ÐÚ\1eÚZ
+8N(CÈÁzÇ\85$'2\ 6\9d!Î>[):\18#D½zǵ,\rz\9d\ 6\8e\14     £MÚ     \rd\85=\86ä\91\ 3\ 6t\85µ³NÅ­=ê
+w©­Á­\83k}å9.púüä9^Æ©=¶ÔI\9dÏ@ÆY\f\9e\89á\88=¢Úußlåï\80\9aÔ\17°\90Dâ
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/a9/53a018c5b10b20c86e69fef55ebc8ad4c5a417 b/tests-clar/resources/twowaymerge.git/objects/a9/53a018c5b10b20c86e69fef55ebc8ad4c5a417
new file mode 100644 (file)
index 0000000..8235f18
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/a9/53a018c5b10b20c86e69fef55ebc8ad4c5a417
@@ -0,0 +1 @@
+x\ 1\9d\8fÍJÄ0\14\85]÷)înV3$¹is\ 3"î\ 4Á\95O\90û\93NŶ\92ɼ¿\15ñ\ 5\\9eï|\1c8²¯ëÒ!dzèÍ\fªÔdXG/ޫϹp*\89¢C³X³\88º@ZÂ8|\95f[\aV\9f0HD\99H\93\ fE]6¯\94\ 2g¶I#g«*ñÏ\17­9UEæHÆH!MHÌ\88\1a\1cÕñh\82ºR¦¡Üûuoð.{ïðz\81\97ýSײÁãí\87|ÌÏóÒ¯w¾È¾>\81Ç1º4\91C8;rn8èq«Û¿\a\867k³\ 1·²É\15Nui·~þM§á\eÜ\10^­
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/a9/cce3cd1b3efbda5b1f4a6dcc3f1570b2d3d74c b/tests-clar/resources/twowaymerge.git/objects/a9/cce3cd1b3efbda5b1f4a6dcc3f1570b2d3d74c
new file mode 100644 (file)
index 0000000..4da7e82
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/a9/cce3cd1b3efbda5b1f4a6dcc3f1570b2d3d74c
@@ -0,0 +1 @@
+x\ 1+)JMU044c040031QHdx6÷ÑìM\17¯9{wk®+\8fºqèIOðD¨d6>É\1c|\92¹X%\ 1>½9j
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/bd/1732c43c68d712ad09e1d872b9be6d4b9efdc4 b/tests-clar/resources/twowaymerge.git/objects/bd/1732c43c68d712ad09e1d872b9be6d4b9efdc4
new file mode 100644 (file)
index 0000000..b9b6012
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/bd/1732c43c68d712ad09e1d872b9be6d4b9efdc4 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/c3/7a783c20d92ac92362a78a32860f7eebf938ef b/tests-clar/resources/twowaymerge.git/objects/c3/7a783c20d92ac92362a78a32860f7eebf938ef
new file mode 100644 (file)
index 0000000..041e890
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/c3/7a783c20d92ac92362a78a32860f7eebf938ef differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/cb/dd40facab1682754eb67f7a43f29e672903cf6 b/tests-clar/resources/twowaymerge.git/objects/cb/dd40facab1682754eb67f7a43f29e672903cf6
new file mode 100644 (file)
index 0000000..ccb156d
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/cb/dd40facab1682754eb67f7a43f29e672903cf6 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/cd/f97fd3bb48eb3827638bb33d208f5fd32d0aa6 b/tests-clar/resources/twowaymerge.git/objects/cd/f97fd3bb48eb3827638bb33d208f5fd32d0aa6
new file mode 100644 (file)
index 0000000..0e028dc
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/cd/f97fd3bb48eb3827638bb33d208f5fd32d0aa6 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/d6/f10d549cb335b9e6d38afc1f0088be69b50494 b/tests-clar/resources/twowaymerge.git/objects/d6/f10d549cb335b9e6d38afc1f0088be69b50494
new file mode 100644 (file)
index 0000000..b298c52
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/d6/f10d549cb335b9e6d38afc1f0088be69b50494 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/d9/acdc7ae7632adfeec67fa73c1e343cf4d1f47e b/tests-clar/resources/twowaymerge.git/objects/d9/acdc7ae7632adfeec67fa73c1e343cf4d1f47e
new file mode 100644 (file)
index 0000000..de94528
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/d9/acdc7ae7632adfeec67fa73c1e343cf4d1f47e
@@ -0,0 +1 @@
+x\ 1+)JMU044c040031QHdx6÷ÑìM\17¯9{wk®+\8fºqèIOðD¨d\12>É4|\92éX%\ 1:79U
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/tests-clar/resources/twowaymerge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
new file mode 100644 (file)
index 0000000..7112238
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 differ

diff --git a/tests-clar/resources/twowaymerge.git/objects/ef/0488f0b722f0be8bcb90a7730ac7efafd1d694 b/tests-clar/resources/twowaymerge.git/objects/ef/0488f0b722f0be8bcb90a7730ac7efafd1d694
new file mode 100644 (file)
index 0000000..00f7d36
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/objects/ef/0488f0b722f0be8bcb90a7730ac7efafd1d694
@@ -0,0 +1 @@
+x\ 1\9d\8eM\ e \10F]s\8a¹\80Í0Ã_\13cÜ\99¸õ\ 4@¡ÕH1\95Þ_¼\82Û\97ï}y±\96òh@¤\ emK     8\90³ÙYÆèä\84Á\1a\8e4Ѩ\8ct^'¦`lPÙ\89·ßÒÚ Ï<g\99yÒY\91\8cÙ1*\17m´\9c\12\a­»\84\99Fá÷¶Ô\r\ 6·\ 1®õ5\15¿Âéó#Ïù2?Ú²\87!Ör\ 6ÉZ¡5Æ\8epD\87(:í\99-ý} ²ø\ 2\15#E¸
\ No newline at end of file

diff --git a/tests-clar/resources/twowaymerge.git/objects/fc/f7e3f51c11d199ab7a78403ee4f9ccd028da25 b/tests-clar/resources/twowaymerge.git/objects/fc/f7e3f51c11d199ab7a78403ee4f9ccd028da25
new file mode 100644 (file)
index 0000000..54989ea
Binary files /dev/null and b/tests-clar/resources/twowaymerge.git/objects/fc/f7e3f51c11d199ab7a78403ee4f9ccd028da25 differ

diff --git a/tests-clar/resources/twowaymerge.git/refs/heads/first-branch b/tests-clar/resources/twowaymerge.git/refs/heads/first-branch
new file mode 100644 (file)
index 0000000..ef0dead
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/refs/heads/first-branch
@@ -0,0 +1 @@
+2224e191514cb4bd8c566d80dac22dfcb1e9bb83

diff --git a/tests-clar/resources/twowaymerge.git/refs/heads/master b/tests-clar/resources/twowaymerge.git/refs/heads/master
new file mode 100644 (file)
index 0000000..ebf18f5
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/refs/heads/master
@@ -0,0 +1 @@
+1c30b88f5f3ee66d78df6520a7de9e89b890818b

diff --git a/tests-clar/resources/twowaymerge.git/refs/heads/second-branch b/tests-clar/resources/twowaymerge.git/refs/heads/second-branch
new file mode 100644 (file)
index 0000000..586a14a
--- /dev/null
+++ b/tests-clar/resources/twowaymerge.git/refs/heads/second-branch
@@ -0,0 +1 @@
+9b219343610c88a1187c996d0dc58330b55cee28

diff --git a/tests-clar/revwalk/mergebase.c b/tests-clar/revwalk/mergebase.c
index c70222f19aac84dc6c1ac77eace9bd69922ad0b3..a44e35b541a3baf68a3ddae36ebc9c4bbe89ac0b 100644 (file)
--- a/tests-clar/revwalk/mergebase.c
+++ b/tests-clar/revwalk/mergebase.c
@@ -3,10 +3,12 @@
 #include <stdarg.h>
 
 static git_repository *_repo;
+static git_repository *_repo2;
 
 void test_revwalk_mergebase__initialize(void)
 {
        cl_git_pass(git_repository_open(&_repo, cl_fixture("testrepo.git")));
+       cl_git_pass(git_repository_open(&_repo2, cl_fixture("twowaymerge.git")));
 }
 
 void test_revwalk_mergebase__cleanup(void)
@@ -81,6 +83,19 @@ void test_revwalk_mergebase__merged_branch(void)
        cl_assert(behind == 0);
 }
 
+void test_revwalk_meregebase__two_way_merge(void)
+{
+       git_oid one, two;
+       int ahead, behind;
+
+       cl_git_pass(git_oid_fromstr(&one, "9b219343610c88a1187c996d0dc58330b55cee28"));
+       cl_git_pass(git_oid_fromstr(&two, "a953a018c5b10b20c86e69fef55ebc8ad4c5a417"));
+       cl_git_pass(git_count_ahead_behind(&ahead, &behind, _repo2, &one, &two));
+
+       cl_assert(ahead == 8);
+       cl_assert(behind == 2);
+}
+
 void test_revwalk_mergebase__no_common_ancestor_returns_ENOTFOUND(void)
 {
        git_oid result, one, two;
@@ -176,7 +191,7 @@ void test_revwalk_mergebase__many_merge_branch(void)
 }
 
 /*
- * $ git log --graph --all
+ * testrepo.git $ git log --graph --all
  * * commit 763d71aadf09a7951596c9746c024e7eece7c7af
  * | Author: nulltoken <emeric.fermas@gmail.com>
  * | Date:   Sun Oct 9 12:54:47 2011 +0200
@@ -255,3 +270,104 @@ void test_revwalk_mergebase__many_merge_branch(void)
  * 
  *       packed commit one
  */
+
+/*
+ * twowaymerge.git $ git log --graph --all
+ * *   commit 9b219343610c88a1187c996d0dc58330b55cee28
+ * |\  Merge: c37a783 2224e19
+ * | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | Date:   Tue Nov 27 20:31:04 2012 -0800
+ * | | 
+ * | |     Merge branch 'first-branch' into second-branch
+ * | |   
+ * | * commit 2224e191514cb4bd8c566d80dac22dfcb1e9bb83
+ * | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | Date:   Tue Nov 27 20:28:51 2012 -0800
+ * | | 
+ * | |     j
+ * | |   
+ * | * commit a41a49f8f5cd9b6cb14a076bf8394881ed0b4d19
+ * | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | Date:   Tue Nov 27 20:28:39 2012 -0800
+ * | | 
+ * | |     i
+ * | |   
+ * | * commit 82bf9a1a10a4b25c1f14c9607b60970705e92545
+ * | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | Date:   Tue Nov 27 20:28:28 2012 -0800
+ * | | 
+ * | |     h
+ * | |   
+ * * | commit c37a783c20d92ac92362a78a32860f7eebf938ef
+ * | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | Date:   Tue Nov 27 20:30:57 2012 -0800
+ * | | 
+ * | |     n
+ * | |   
+ * * | commit 8b82fb1794cb1c8c7f172ec730a4c2db0ae3e650
+ * | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | Date:   Tue Nov 27 20:30:43 2012 -0800
+ * | | 
+ * | |     m
+ * | |   
+ * * | commit 6ab5d28acbf3c3bdff276f7ccfdf29c1520e542f
+ * | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | Date:   Tue Nov 27 20:30:38 2012 -0800
+ * | | 
+ * | |     l
+ * | |   
+ * * | commit 7b8c336c45fc6895c1c60827260fe5d798e5d247
+ * | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | Date:   Tue Nov 27 20:30:24 2012 -0800
+ * | | 
+ * | |     k
+ * | |     
+ * | | * commit 1c30b88f5f3ee66d78df6520a7de9e89b890818b
+ * | | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | | Date:   Tue Nov 27 20:28:10 2012 -0800
+ * | | | 
+ * | | |     e
+ * | | |    
+ * | | * commit 42b7311aa626e712891940c1ec5d5cba201946a4
+ * | | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | | Date:   Tue Nov 27 20:28:06 2012 -0800
+ * | | | 
+ * | | |     d
+ * | | |      
+ * | | *   commit a953a018c5b10b20c86e69fef55ebc8ad4c5a417
+ * | | |\  Merge: bd1732c cdf97fd
+ * | | |/  Author: Scott J. Goldman <scottjg@github.com>
+ * | |/|   Date:   Tue Nov 27 20:26:43 2012 -0800
+ * | | |   
+ * | | |       Merge branch 'first-branch'
+ * | | |    
+ * | * | commit cdf97fd3bb48eb3827638bb33d208f5fd32d0aa6
+ * | | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | | Date:   Tue Nov 27 20:24:46 2012 -0800
+ * | | | 
+ * | | |     g
+ * | | |    
+ * | * | commit ef0488f0b722f0be8bcb90a7730ac7efafd1d694
+ * | | | Author: Scott J. Goldman <scottjg@github.com>
+ * | | | Date:   Tue Nov 27 20:24:39 2012 -0800
+ * | | | 
+ * | | |     f
+ * | | |    
+ * | | * commit bd1732c43c68d712ad09e1d872b9be6d4b9efdc4
+ * | |/  Author: Scott J. Goldman <scottjg@github.com>
+ * | |   Date:   Tue Nov 27 17:43:58 2012 -0800
+ * | |   
+ * | |       c
+ * | |   
+ * | * commit 0c8a3f1f3d5f421cf83048c7c73ee3b55a5e0f29
+ * |/  Author: Scott J. Goldman <scottjg@github.com>
+ * |   Date:   Tue Nov 27 17:43:48 2012 -0800
+ * |   
+ * |       b
+ * |  
+ * * commit 1f4c0311a24b63f6fc209a59a1e404942d4a5006
+ *   Author: Scott J. Goldman <scottjg@github.com>
+ *   Date:   Tue Nov 27 17:43:41 2012 -0800
+ *
+ *       a
+ */