Add the ahead/behind test that Carlos suggested

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

tests-clar/resources/twowaymerge.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

tests-clar/resources/twowaymerge.git/config

@@ -0,0 +1,5 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true

tests-clar/resources/twowaymerge.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

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]
+# *~

tests-clar/resources/twowaymerge.git/objects/1c/30b88f5f3ee66d78df6520a7de9e89b890818b

@@ -0,0 +1,3 @@
+x
<01>ŽM
+Â0F]çs
ËÌä§	ˆ¸Üz‚Iš¶Ši¤¦÷·^Áå{<>¾TKy4`6‡¶æš,y<>’9j§GJì8<C3AC>ÁÇÞb¢‘\Œfõ–5/
Ç^‰8v¹'ö<>‚ÙËœì`SÆ<><C386>%[›ë
+÷T[ƒ[×úŠ,púüÌsºL<C2BA>6o±Kµœ<C2B5>´5Ø;ŽèÕn÷›-ÿ= ²úÿDÃ

tests-clar/resources/twowaymerge.git/objects/1f/4c0311a24b63f6fc209a59a1e404942d4a5006

@@ -0,0 +1,2 @@
+x
<01>Í=Â0@aæœÂ ²Mê6BlH¬œ ¿m!RqïO¹ë7¼[­‹
rÐ5g°N’Xƒ‹Å±)Eg]ÏDY2c	R8xã7<C3A3>Û
+<EFBFBD>ØTáÞÁ­½Rõo8~òœ®Ó¢óºØêèÔ[”
™àˆ#¢Ùußjþ;`¼ùÔÙ7ó

tests-clar/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83

@@ -0,0 +1,3 @@
+x
<01><>K
+Β0@]ηs
K&<26>¤	<09>Έάz‚™4ιΫHMοo½‚ΫχΰρbY–©‚1t<31>[Jΰb<CEB0>lΙ<6C>µβ¥ν4vΙ΅±Lβ³
μ'—Υ›·΄V`B¦<42>ϋ .
+λΞIφm ο1υZ¨Η x―cΩΰK­πhΰ^^ύΒ+\>?2·a<C2B7>γ.M,Λ°µtTB‹pΦ^kuΠc³¦ΏjV_«sFh

tests-clar/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4

@@ -0,0 +1,3 @@
+x
<01>ν
Â0@ajOq<10>cßù"!D‡DËþKÂ1
+Îþ„h_ñéÅZÊ£AßÛC[s†aÌÈžp´I³±‰#‹„lB<6C>…œqÈêí×¼4ð<19>Z"<05>¡Ç(œyGF¢¢ød#y«<79>ò[›ë
+÷X[ƒ[×úJÅ/púüÊsºL<C2BA>6o¡‹µœA²èX„ሂ¨öºo¶ü7 ’úÔ¸Ec

tests-clar/resources/twowaymerge.git/objects/6a/b5d28acbf3c3bdff276f7ccfdf29c1520e542f

@@ -0,0 +1 @@
+x
<01>ÎM‚0@a×=Å\@2ýcÜ™¸õeÚ†Rƒåþâܾŗǵ”¹<E2809D>RæÔ¶”@¢Šœ(i$™uOÉ1ö9Ro"“
¬9¸à¼x‡-­
ü@¬µcc3;ê-KvHÊ+‡9ÙèÁFe¼{›êO®­Á£ƒ{]b	+\>¿òoãܦ}踖+Hm
z<>šàŒ„(Žzl¶ô7 ñ•œF-

tests-clar/resources/twowaymerge.git/objects/7b/8c336c45fc6895c1c60827260fe5d798e5d247

@@ -0,0 +1,3 @@
+x
<01>ÎA @Qלb.`3S(‰1îLÜz‚<7A>B[µÅTzëܾÅÏ<C385>ež§
+D|¨kJCß3f‰´íȵœ‚uÙ	›L>YGMÌV½eMK<05>9¢ÑZˆƒ5ÙæHè¥õ¢#{¦ž¥E´J¶:–î±Ô
+·®åÕϲÀéó“Çp¦:n¡‰e>ƒ6-£sHGìÕ®ûfMÔS}
ZE²

tests-clar/resources/twowaymerge.git/objects/82/bf9a1a10a4b25c1f14c9607b60970705e92545

@@ -0,0 +1 @@
+x
<01>ŽË
Â09»Šm€hã_ÖBÜ<42>¸R<C2B8>ן„cœþ1-p<>§yšPKy4<79>RÚ–D›GŒF»ÀJvÉFE>‡1#q²Ž
j§ÅÛoimbvSŽŠYSbEr²Š¸»Q"eÓÑ{+üÞ–ºÁ=ÔÖà6Àµ¾bñ+œ>?òœ/ó£-;¡–3ŒÊhœ¬C‚#¢è´g¶ô÷<C3B4>XÄÌyF¤

tests-clar/resources/twowaymerge.git/objects/8b/82fb1794cb1c8c7f172ec730a4c2db0ae3e650

@@ -0,0 +1,3 @@
+x
<01>ν
Â0@ajOqù7BtH´Lp¾ó%A8FÁÙŸ°íW<=ª¥Ì
¬õ‡¶æx"ÊŽØ$—%1†dÄcÏDNLˆ:Yv=©7®yiÐc
+l¤$Ž\b{‰DÂbOd‚Õ9x+
+·6ÕT[ƒ{·úâ‚œ??yŽ×qnÓ–:ªåƯcÔÞÁQZ«]÷Í–ÿ¨¢¾7 H†

tests-clar/resources/twowaymerge.git/objects/9b/219343610c88a1187c996d0dc58330b55cee28

@@ -0,0 +1,2 @@
+x
<01>ÏKj1Ьç½óÊFj}Z‚¼3²Ê	¤VÏÇdFA#ß?’\ ËzÅu]—FÓSo" ‰JðÆ&‚^˜‚Ž,9$G’Eéd)7|¦&[6”(FU"&Žh<<1E>¯FÉc4AÆ¿>"ZÑQ;m9Û\;ïKP%1b9k‰93¤GŸkƒw®½Ãënõ£¬iƒçý[îÓuZúüÈ®ëhã¬"RÞÂY¥†C<E280A0>[]þ=0¼I›rKÏp—¶÷óO:Á²õ
+»pÝʯ
_¾(c‡

tests-clar/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19

@@ -0,0 +1,3 @@
+x
<01>־½
ֲ0@ajOq<10>ש7'!D‡Dֻצ<>	A$Fֱ<46><D6B1>°םW<=©ף<5׀<35><1E>Z
+8N(Cֱָzַ…$'2<06>!־>[):#D½zַµ,
z<><06>	£M<C2A3>	
d…=†ה‘t…µ³Nֵ­=ך
+w©­ֱ­ƒk}ו9.pת<70>ה9^ֶ©=¶װI<D7B0>ֿ@ֶY<0C>‰בˆ=¢<>u<EFBFBD>lון€<D79F>װ°<>Dג

tests-clar/resources/twowaymerge.git/objects/a9/53a018c5b10b20c86e69fef55ebc8ad4c5a417

@@ -0,0 +1 @@
+x
²▐мJд0┘]В)НnV3$╧is"На∙O░Ш⌠Nе╤▓и╪©Я\·О|8╡╞Кр!dzХм╙тdXG/ч╚о╧p*┴╒CЁXЁ┬╨@Zб8|∙f[V÷0HD≥H⌠E]6╞■g╤I#g╚*Яо╜9UEФHфH!MHл┬уЯh┌╨R╕║эШuoП.{ОПz│≈ЩSв╡аЦМ┤|лоСр╞w╬х╬>│г1╨4▒C8;rn8Хq╚ш©├7kЁ
╥╡иNui╥~ЧM╖Аэ^╜

tests-clar/resources/twowaymerge.git/objects/a9/cce3cd1b3efbda5b1f4a6dcc3f1570b2d3d74c

@@ -0,0 +1 @@
+x
+)JMU044c040031QHdx6<78><36>ｯ9{wkｮ+昭q鍼O<E98DBC>ｨd6>ﾉ|鳥X%
>ｽ9j

tests-clar/resources/twowaymerge.git/objects/d9/acdc7ae7632adfeec67fa73c1e343cf4d1f47e

@@ -0,0 +1 @@
+x
+)JMU044c040031QHdx6<78><36>ｯ9{wkｮ+昭q鍼O<E98DBC>ｨd>ﾉ4|帝X%
:79U

tests-clar/resources/twowaymerge.git/objects/ef/0488f0b722f0be8bcb90a7730ac7efafd1d694

@@ -0,0 +1 @@
+x
<01><>MΒ F]s<>Ή€Ν0Γ_cά™Έυ@΅ΥH1•ή_Ό‚Ϋ—ο}y±–ςh@¤mK	8<>³ΩYΖθδ„Α<1A>4Ρ¨<CEA1>t^'¦`lPΩ‰·ί<C2B7>Ϊ Ο<g™y<E284A2>Y‘<59>Ω1*m΄<6D>­»„™Fαχ¶Τ
·
®υ5ΏΒισ#Οω2?Ϊ²‡!ΦrΙZ΅5Ζ<35>pD‡(:ν™-ύ} ²ψ#EΈ

tests-clar/resources/twowaymerge.git/refs/heads/first-branch

@@ -0,0 +1 @@
+2224e191514cb4bd8c566d80dac22dfcb1e9bb83

tests-clar/resources/twowaymerge.git/refs/heads/master

@@ -0,0 +1 @@
+1c30b88f5f3ee66d78df6520a7de9e89b890818b

tests-clar/resources/twowaymerge.git/refs/heads/second-branch

@@ -0,0 +1 @@
+9b219343610c88a1187c996d0dc58330b55cee28

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
+ */