From a200bcf72838488c1550b1709a3f075f722e0244 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Mon, 26 Oct 2015 17:25:42 -0400
Subject: [PATCH] merge: add a third-level recursive merge

---
 tests/merge/trees/recursive.c                 |  46 ++++++++++++++++++
 .../00/7f1ee2af8e5d99906867c4237510e1790a89b8 | Bin 0 -> 169 bytes
 .../15/faa0c9991f2d65686e844651faa2ff9827887b | Bin 0 -> 665 bytes
 .../4d/fc1be85a9d6c9898152444d32b238b4aecf8cc | Bin 0 -> 168 bytes
 .../50/e4facaafb746cfed89287206274193c1417288 | Bin 0 -> 207 bytes
 .../5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 | Bin 0 -> 672 bytes
 .../5f/18576d464946eb2338daeb8b4030019961f505 | Bin 0 -> 208 bytes
 .../ad/1ea02c2cc4f55c1dff87b80a086206a73885eb | Bin 0 -> 207 bytes
 .../ca/49d1a8b6116ffeba22667bba265fa5261df7ab | Bin 0 -> 208 bytes
 .../e1/dcfc3038be54195a59817c89782b261e46cb05 | Bin 0 -> 212 bytes
 .../f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e | Bin 0 -> 672 bytes
 .../.gitted/refs/heads/branchD-1              | Bin 0 -> 41 bytes
 .../.gitted/refs/heads/branchD-2              | Bin 0 -> 41 bytes
 13 files changed, 46 insertions(+)
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/15/faa0c9991f2d65686e844651faa2ff9827887b
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/5f/18576d464946eb2338daeb8b4030019961f505
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/e1/dcfc3038be54195a59817c89782b261e46cb05
 create mode 100644 tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e
 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchD-1
 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchD-2

diff --git a/tests/merge/trees/recursive.c b/tests/merge/trees/recursive.c
index a7358e7e3..cd879677f 100644
--- a/tests/merge/trees/recursive.c
+++ b/tests/merge/trees/recursive.c
@@ -154,3 +154,49 @@ void test_merge_trees_recursive__three_norecursive(void)
 	git_index_free(index);
 }
 
+void test_merge_trees_recursive__four(void)
+{
+	git_index *index;
+	git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
+
+	struct merge_index_entry merge_index_entries[] = {
+		{ 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+		{ 0100644, "d55e5dc038c52f1a36548625bcb666cbc06db9e6", 0, "veal.txt" },
+	};
+
+	cl_git_pass(merge_commits_from_branches(&index, repo, "branchD-2", "branchD-1", &opts));
+
+	cl_assert(merge_test_index(index, merge_index_entries, 6));
+
+	git_index_free(index);
+}
+
+void test_merge_trees_recursive__four_norecursive(void)
+{
+	git_index *index;
+	git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
+
+	struct merge_index_entry merge_index_entries[] = {
+		{ 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+		{ 0100644, "898d12687fb35be271c27c795a6b32c8b51da79e", 1, "veal.txt" },
+		{ 0100644, "f1b44c04989a3a1c14b036cfadfa328d53a7bc5e", 2, "veal.txt" },
+		{ 0100644, "5e8747f5200fac0f945a07daf6163ca9cb1a8da9", 3, "veal.txt" },
+	};
+
+	opts.flags |= GIT_MERGE_NO_RECURSIVE;
+
+	cl_git_pass(merge_commits_from_branches(&index, repo, "branchD-2", "branchD-1", &opts));
+
+	cl_assert(merge_test_index(index, merge_index_entries, 8));
+
+	git_index_free(index);
+}
+
diff --git a/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 b/tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8
new file mode 100644
index 0000000000000000000000000000000000000000..d9399d71c227358546c7b4c9f7a02f01b31fe31a
GIT binary patch
literal 169
zcmV;a09OBa0i{k!3IZ_@^gOS~2S&1VX8{pGJbLp3SvpJ(naCLN`$q8xLLF+OsMu;P
zok@gU--sAyVbSOW8XRZ}QYo7}1si}X&V_SYWaK#A{YGnNBvQ;#ab*J`2!|e>6((9|
ztPD~M0v*HX`)6O;#xCjQx5REstB<y_0}c1XPV^0aY9CuYG68_rfijBC95|nbJI;3c
Xb7s1>RC0;FmvLd>Jj>|~U}8~$%7#e^

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/15/faa0c9991f2d65686e844651faa2ff9827887b b/tests/resources/merge-recursive/.gitted/objects/15/faa0c9991f2d65686e844651faa2ff9827887b
new file mode 100644
index 0000000000000000000000000000000000000000..54cd6f26ebd11798f73ecd010880bbaa79b46ac1
GIT binary patch
literal 665
zcmV;K0%rYq0Zo)abJH*og*oe2EO(QcmSaviq(f(zrnD(N%l6vVSeA@d#+YBvTO|Q*
zv7}wS_q|nWA8We1yTAYN{do9Fucx=?oiWdEXL@`(pXfl(r!$?uyd018?d|Y#ex=g`
zy&ulUmx?}93@!$tX2~Rz^}eFh)6vKrW9Sx7v7_4CW~7<tnG?-%2`#r3+0as6qaG0J
zb49Dm!(}B=9ul(=?-~|8;n@Zn?6k+POfFL$ohQj`Tj#e@HN+*!o@8_r4w%?9R-g=u
zwhH|?&<u$#<f!$QWN<-S|6~iz|F>0DrJM0F^qlsT?Z^~Sjz08H6$D*;luKjRmHj@k
z6(-lg;${S$d`rm*Lx%RT)H`3m^f9*7;5gb$?$?C?#HoO6YtNqwMgd0yrJaXG=uI01
zfKgusA~bF6#{x=Ax$lK)wi%vR)<h&H3%7Z2VsKGj62xe&ZCjE!F*QR(JT1*OiRW#v
zIi<^%#AQaxRBzNW%&}BPvP+8b(q222^H?c>71JD%X%j<sVR4}+a4%I0R=m~@R*c4o
zTgx0=QwNE#WW<hw3->G6WLGR8b4^WeP@g+`?2LXCjBrgMX3SdZxXG9dS(%~Z#;KtB
zu{bmdyq398D$U3N8qKP~G)rnd@>5<&8}4`X5EF8128(&1EiN?Kt<009HvR_Z<YtEA
z$>u1=g^D_t1WDRay<bNI%rGfIDrJd@0~&A{cmkP{26ept_3wfi;AKUQ39myZ7-zR~
zHGE>obo6It5Zuwb?oYP83U`9SO{JP?Q6U$TCA0F*VC^zbG5Bpqhk#Z#<r`al6}Ouf
z!Fx6JZT!o-Ni>F~8I==~LNlF6$@t$me|db>MGGVSkT;MBOo<y1`e^<DVknB6?JGf|

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc b/tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc
new file mode 100644
index 0000000000000000000000000000000000000000..9db684d40b16434bca775fe6138b14567c1a4a89
GIT binary patch
literal 168
zcmV;Z09XHb0i{k`3IZV%?b}t{4NR!xYak+sKKp9}SG_WRIEEQ*KZ|w{95^pHoKQ>2
z9i&#f-iQFBAmlR05LD7Sh?tVI-f`s4NN&*1&S~=Oj*Yes0o4)(I&Xw9DUnAhjj?{P
z(FwIQW5J?l`0Q(KaEUK$5pHWOkGjEuM*2}F`W8R8549XYD5c$^=4FA2E6&+S$JtJQ
W&ai8ZIpu&oj|&6mNw7CPgj3meM@@$S

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 b/tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288
new file mode 100644
index 0000000000000000000000000000000000000000..b1eaee5572fc754d31eb4fd30360ab4a6d75c181
GIT binary patch
literal 207
zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#EbmZBY#c#46i1b}D{8<!!zsFFHF&?TYzp}U_
zwFqM4dimoH^*7hv7iU~ixAA05$&{lrpsLDJ6LY|7M1L(fIa6LYH6yRZE%4W(|1;D(
JssYLtT&14(U!?#5

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 b/tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9
new file mode 100644
index 0000000000000000000000000000000000000000..fa1c9e5dc44270905b8af66ec3cf6e38bbcb0a1f
GIT binary patch
literal 672
zcmV;R0$=@j0acVwkJB&^#X0*^4EIoJLE_R=4@J8Y+Ah0Y_E<T|B(dVy!G8$h)APn@
zLEIYKGk)*)#;vWd>F)01=Xc+ahp+T<dVSg{_4InChsX1Y4)k<7)A|1Sc%*Nyhv)MP
zoxaf9;e33q=o5Koyo=Q2M3+mPw6&K@MW@H3inI5w%a(jcwbji?GtV;zntgUHw-ssE
zQd+zmh}x!#7L$f;B~Tgyvx?R<9OZ;%?P$=`9={TqM71}TVq)DIyOyfK=MeW4M>FAo
z@=c>7)Irl)p&vV%A=9|zrCw7UjFZ+sS=;KrwxX(ZQ`Wnl!=92JnLNtThyJO8pv_0Q
z)OTIk?*r?|WI9+}RYWJ-QZSJrL;7gyjV)k$?^|kc9Bn4^Ya;-0A|UD7@`r*kf}?`c
z&cY(}hLs$^h_3<>npU=B0VSo}_mOJW37!|Wa2He1aGM4b6)s9SK#bJtwx#GNre^Sn
zr=?kkXnEaBPGQ@MKF>&+>XllCIgXWz$ppc;wU<uiJXQ)|!8Chh+IW|Y%f|Ht?xiYY
z#Y*j<qmmeLYng*<>LB5ALhLBmxL>&jy<h>EOKNh1_}tM$r{tqxgllp>Vb(&&O~Pcv
zg&8_-oC=yB*`SHzrObs;X-0O?s1^yP$)UB#Pk141xZlwiACOx!Xv_nxKGUSvGEbUX
z{~MfxnHh>FoqSZrRn(afk)$5Q`*k$H43pwwB`h(>Km#rVPasp$ppKWn{*6-uye!Bu
z;C09Z<Lp|lhEEKcjQ-3Ff;)PX{Ykf1;U=PR6{%{<B4jgJGAr*4*0y=_&aOK;IJD9s
z-Pp>jxZRW^-m9u_<6quQpwZ=K6i!GA&152D!hgs4{^3OyHH`E_T0z1w1#Up-z4`;|
Ggp3<Z)n1YS

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/5f/18576d464946eb2338daeb8b4030019961f505 b/tests/resources/merge-recursive/.gitted/objects/5f/18576d464946eb2338daeb8b4030019961f505
new file mode 100644
index 0000000000000000000000000000000000000000..d03742b92d73c3c6b39d76ae2a40091a5af2f8eb
GIT binary patch
literal 208
zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#EbmZBY#c#46i1b}D{8<!!zsFFHF&?TYzp}U_
zwFqM4dimoH^*7hv7iU~ixAA05$&{lrpsLDJ6LY|7K5p@0nK8>sMr4E8`L(}{dV`nm
Ki30$}rCe1lgkm%R

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb b/tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb
new file mode 100644
index 0000000000000000000000000000000000000000..99207a9dd65bf2aafc27ac58179a678b7b07084a
GIT binary patch
literal 207
zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjK<NGwWBFD=$9sVHIizd0|^KK_1J_KJW-
zj85rUT1Ogcp$d~yQ`5j|GQLUZ`?Ox3C(L=Xrp`4n?9Lp9X)rbUrI|T7nP6q!HDLh^
z-FhYU4;$vaj*`8{*U-uZRhC|qSXK#EbmZBY#c#46i1b}D{8<!!zsFFHF&?TYzp}U_
zwFqM4dimoH^*7hv7iU~ixAA05$&{lrpsLDJ6LY|7;@aK6D)6u2pAyA>>zkO(%F|N4
JD*?MaTYLMiW3vDN

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab b/tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab
new file mode 100644
index 0000000000000000000000000000000000000000..1ea596763d7fab7757478d282f14a88fe220af89
GIT binary patch
literal 208
zcmV;>05AV|0i}<-P6aUxM5*^H+}-M;IB{MQLP&^`jvw$k4ttB;pb*6G6J9+MmB(l7
zkw)6SUj{huu0~e{Z<Hzvb6q0^sajIDDOwY3B+O2bFxr%s7w&ot;9^-cEBYG3>I$Np
z4^~61MVzv$ImF80_dcOtJ)<Ne94VJ*yhLUrtIfn_PA$ceS@>;it;0ik=U(7xYx`?E
z;6^9?RCoGi{A}0K_FF(ApE6nWa5iMjGU+Tg^q(=yqxNTo?=(35wZaK5$7ry2K4iN;
K<MIJJPH(~gUt`4p

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/e1/dcfc3038be54195a59817c89782b261e46cb05 b/tests/resources/merge-recursive/.gitted/objects/e1/dcfc3038be54195a59817c89782b261e46cb05
new file mode 100644
index 0000000000000000000000000000000000000000..3668b546a6368886a688a8a026c29590c2d7f687
GIT binary patch
literal 212
zcmV;_04x7^0iBP%P6ROwgsJls?yfqNALmaxp_33L9WUT@9QKOcpj;5IPk^IGR348<
zpEcaJ?J~f5cQ?8Scr93oiRuzDaFvp>P0{LLBbw~kpoumm^+sLx0m=Bqli{S9BIXjc
z=SZY^u^CCvDWy2nzj-Q_Sh5&jLs(of#?1#-Lal|JkgGYwN<q>4SX+mu@<F}8%i6YU
z+u<bB{ZeQ7KHRo@ZrcMGM4vKRo8YKXYc<_jZpi;IXl@wwEd5pBhX#kgRye?A9}SjH
OJFkyNt3ClfO>j-s_-C5{

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e b/tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e
new file mode 100644
index 0000000000000000000000000000000000000000..7cbaaeecf596e2fa780fe9255822559fc9527259
GIT binary patch
literal 672
zcmV;R0$=@j0Zo)okJB&^#X0*^4A&}DT9CN()I(Rh651}iT{t_*B(dVy!G8$h)APn@
zfm>sH#_#>!xV7~)-Q9is{O;T7_=R52Z_j(Bp5HF?_;fkbk)F>Nx;(s`PW1Kd_;Pur
z^F4h(UQRC+eIoCScafT$C{Ehiiq20b6=&~Vmo52@YO9-(W}asbH2dsYZY$ERrL=fC
z5VcJeEhY`yN}x0ZW)-bzILZmj+R>n=1AZkkiE3{w#l*Tbb}dzd&mkTtj%LCE<(o!F
zD1)N4LO*siL!xoXOTDHz7$>cNvWDjW+ls2vO<C`H4hKqlWb!CSANr>Xf;J!JQr~rD
zzYnY<lj&e_RS}(ROTk2j4C$k(H@1N3y>F?(akQDtuZ;l2iGZYQ%O48H2#yL$I}3}@
z8&+}vBfbhmXj<8h1(cL>-$$xhCwN|15{W5jxJ`qJ3KyjuAVz9++fwusQ!{wP)6%R%
zw7ec9r?72BpJ${@^-3+n9LGw<WP)Ja+DoT$9xDZ~V46KLZM;jyW#f7R_fnOyVx@M_
zQAv!rwamdab&zm5A$AmO+^<}NUa)}7B{jK0eD3M7Q}R(T!ZkUcFl(XXCSfw-!VDcZ
zP6f@6Y|zB<QszRaG$T7`REq@D<j`8=C%lk0-0$h$2jtca8uLJ_&ot?^%#)_p{|4t^
zW`^QPCm)q@6?G;=B&kR7ejN=k!=$)a2}?{I(16Rp6UdY_sN?0Yf8*2uFAH)EcpWmq
zIJ=gs;S)n9qdzl);GVwA{-oQha1&9uic~da5we*qnU!}2Yuh||XV*O)9a`y-ZfxaM
z+-}Md?^V^e@h|Tt(CBhA3MV9mW-^g6;eX@u@c1f=ns&R%^g~*~!triLfg4bIul@j)
G#*0Vw1x)q;

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 b/tests/resources/merge-recursive/.gitted/refs/heads/branchD-1
new file mode 100644
index 0000000000000000000000000000000000000000..fa96ccb28f0f6f79ea77f1aef934f00ca85e3552
GIT binary patch
literal 41
ucmV~$!4Uu;2m`Rc+X%%g<4D2%M=(J@?Hb0-K1wEc7=U&wa~AICQCc7JG7D({

literal 0
HcmV?d00001

diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 b/tests/resources/merge-recursive/.gitted/refs/heads/branchD-2
new file mode 100644
index 0000000000000000000000000000000000000000..8a87f986838af1825b5f03f80cce4970665bbcf6
GIT binary patch
literal 41
ucmV~$K>+|D2m`>sX$C5=IH=G+f_H$oRB3k9ek5UGewR+)f)Xb(cw&6xH40Mz

literal 0
HcmV?d00001