From b1eef912cffb9e3ce9792b6aee816c1a45c85fb0 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Tue, 27 Oct 2015 18:00:30 -0500 Subject: [PATCH] merge: add recursive test with conflicting contents --- tests/merge/trees/recursive.c | 23 ++++++++++++++++++ .../21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e | Bin 0 -> 670 bytes .../38/55170cef875708da06ab9ad7fc6a73b531cda1 | Bin 0 -> 664 bytes .../5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0 | Bin 0 -> 208 bytes .../78/3d6539dde96b8873c5b5da3e79cc14cd64830b | Bin 0 -> 176 bytes .../ca/7d316d6d9af99d2481e980d68b77e572d80fe7 | Bin 0 -> 207 bytes .../ef/1783444b61a8671beea4ce1f4d0202677dfbfb | Bin 0 -> 174 bytes .../.gitted/refs/heads/branchF-1 | Bin 0 -> 41 bytes .../.gitted/refs/heads/branchF-2 | Bin 0 -> 41 bytes 9 files changed, 23 insertions(+) create mode 100644 tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e create mode 100644 tests/resources/merge-recursive/.gitted/objects/38/55170cef875708da06ab9ad7fc6a73b531cda1 create mode 100644 tests/resources/merge-recursive/.gitted/objects/5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0 create mode 100644 tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b create mode 100644 tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7 create mode 100644 tests/resources/merge-recursive/.gitted/objects/ef/1783444b61a8671beea4ce1f4d0202677dfbfb create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchF-1 create mode 100644 tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 diff --git a/tests/merge/trees/recursive.c b/tests/merge/trees/recursive.c index 46effa5c2..abca01727 100644 --- a/tests/merge/trees/recursive.c +++ b/tests/merge/trees/recursive.c @@ -246,3 +246,26 @@ void test_merge_trees_recursive__three_base_commits_norecursive(void) git_index_free(index); } +void test_merge_trees_recursive__conflict(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, "fa567f568ed72157c0c617438d077695b99d9aac", 1, "veal.txt" }, + { 0100644, "21950d5e4e4d1a871b4dfcf72ecb6b9c162c434e", 2, "veal.txt" }, + { 0100644, "3855170cef875708da06ab9ad7fc6a73b531cda1", 3, "veal.txt" }, + }; + + cl_git_pass(merge_commits_from_branches(&index, repo, "branchF-1", "branchF-2", &opts)); + + cl_assert(merge_test_index(index, merge_index_entries, 8)); + + git_index_free(index); +} + diff --git a/tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e b/tests/resources/merge-recursive/.gitted/objects/21/950d5e4e4d1a871b4dfcf72ecb6b9c162c434e new file mode 100644 index 0000000000000000000000000000000000000000..a87732611a38ea041d580d75e7e8b5a865babf96 GIT binary patch literal 670 zcmV;P0%84l0Zo*_Zrd;rM0@5}><738f&#txBtjIaa;d87*LRk( z+ukgRT+X~1y7IB2hlfv}KYTwOztZdZ?XoxK@^+=C=j)k{bU9z?`sL+xqHk} z)CFRF-qGT6zr9J@Xd~X$EV{z84b9_Ib1Zev7cgCn4b@nVF{Asn5r8-qkZtApW5FokXrQ$9un4_r zr2sJMt3ZUNmHkja=~nJKp^9yW=Y=&9$;rZP?wuGMl;;F7y4N-hNgSE#J|domCY!|b zdeEHG_DSMAA!VvoY8d8Nc1E&Gig6pSlgfI$DS#Ez6p?8iLv~?yp(AiFyJo!cy0^Dt zG)A0SdT>h}B*L5#J2q_GZ(NgI@B*1@YI=hD+|yHQ^r2vcYYH)=YpLZrqZzU=L&u#{ zLGxpF7!r6Xy-+IkzyTV~qQTU2YCQ5&UPv46_w*POa;tlbKF}Ix8tq#8WT}b2!8y5! zp?I`8ig95_txJL=?V#Ro)c`XzCCE-$qH#b2E~`6+lS~pTjvYJ>A^dv2aa!Qk z*z@>aZslV|4-X$dz59MTexaB1>t%1u<@HKWU$196(&c=m>*wdwiN3uapRX@;ex$eK z_4K@>+$Uy=!Nnj{&zVBZlw%|rt@k_Ju#qXo(9WJ>OO?0vKod_BCz|3M8g6!ELqmCq zS|HZv9W5^R+ezA181b%V(F)HtP;bWrer0l*s^~mPX4^Qwmaaa|Ne(1~8&P0lU0VS{ zAX*hN2buuYg&eitlJqX<=$~wX`Twzss!TIJhK|#LvK>Ge?U+OVPyx`!qb!YWTkgBW zR+wB1imMS!@(m>?3>Z4cQs;aTri-zm8s!)>x?h_D0H*-5tvr7yG75AwK-zjx1m3h# zfH2CdhzLw8`=JP>t=x4&726EX3#%iNlLgz{J26<4=L9g?Ynz57j!bnQVNXMoP2zby zs84CTk~mNBl&X~)2050Uk?fMnxQ*9Ir5-0mV3lc#@U)I0yD+=ZAs~Q(t{Ep@dwVNJ zZN%1+gPZG6BFq`KqhZtirfaeb4&b@ErW=&!o}OBxA4Nv6E@4E_TCOvaAqz8b+;u9_ z{Fohv1YSxmRF!(*0E}i)W9m6I9{#Cba2xFR^cWL-t9y$)&>CkN?OO6=sfoX#b8-^{ z@n~}tK^~{ZW0Y)t_Rf#PGOiPQZoKSt_YbPS`g{_yh4edM@68|Lp^zqDFGSh^ literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0 b/tests/resources/merge-recursive/.gitted/objects/5b/8e1e56cb99e8b99ac22eec8aebf6422ecd08c0 new file mode 100644 index 0000000000000000000000000000000000000000..c3e6d31ca217790364fa5f70e6111377525bf55b GIT binary patch literal 208 zcmV;>05AV|0V^p=O;s>5GG{O}FfcPQQAjK-wLp;;n{f K7XkpfJzPUFfMJ;c literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b b/tests/resources/merge-recursive/.gitted/objects/78/3d6539dde96b8873c5b5da3e79cc14cd64830b new file mode 100644 index 0000000000000000000000000000000000000000..e2f34d6bb2585aa9fc7a1df8d940733bedae26d4 GIT binary patch literal 176 zcmV;h08jsT0i};?3c@fDg#DdU>;)=$G%pYlL{H!aHrb6W*hXr^>s!Se_;2PL7-n*v zrm=x`a?=)O$mq!^M~)(v7)kd*aSW1NNZzycnu09s#T^%(8=&dgqH={XC6dNibjBc3 z3R?Lbi=l)zkicgf>H;Tv;X-g3>h!2H?0BUgb>MICbK6{}J*d97F*qX?bka&GR=SRD e{AZ0g*16oq+{XC|OzZvE*akRvTD$=tv{mv^x>e2q literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7 b/tests/resources/merge-recursive/.gitted/objects/ca/7d316d6d9af99d2481e980d68b77e572d80fe7 new file mode 100644 index 0000000000000000000000000000000000000000..0733fa232bf68c48a5dc822e57159816e07198d7 GIT binary patch literal 207 zcmV;=05Jb}0V^p=O;s>5GG{O}FfcPQQAjKl?)z_%qA{hM7=u zo+~ITH+5x(e)Npo+b|9T`vw%0Vh)~oOx83WqVz$EJFUD_a7v@cgky?YvTs)#!vHlq1CcTW~iCg`=cb(PU!0T^BEF=GZ8V*u6gMN(&VL literal 0 HcmV?d00001 diff --git a/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 b/tests/resources/merge-recursive/.gitted/refs/heads/branchF-2 new file mode 100644 index 0000000000000000000000000000000000000000..abe2ea947d13454d75b588ed856abbb37615881f GIT binary patch literal 41 ucmV~$!4Uv31O&i;s&R6Ib_n_}A-l8ixFpMvVUC(fzQM9ZMa{jpw$2CY@C#W0 literal 0 HcmV?d00001