_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
compare_change () {
- cat current
sed -n >current \
-e '/^--- /d; /^+++ /d; /^@@ /d;' \
-e 's/^\([-+][0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /p' \
diff -u expected_stages current_stages
}
+cat >bozbar-old <<\EOF
+This is a sample file used in two-way fast forward merge
+tests. Its second line ends with a magic word bozbar
+which will be modified by the merged head to gnusto.
+It has some extra lines so that external tools can
+successfully merge independent changes made to later
+lines (such as this one), avoiding line conflicts.
+EOF
+
+sed -e 's/bozbar/gnusto (earlier bozbar)/' bozbar-old >bozbar-new
+
test_expect_success \
setup \
'echo frotz >frotz &&
echo nitfol >nitfol &&
- echo bozbar >bozbar &&
+ cat bozbar-old >bozbar &&
echo rezrov >rezrov &&
echo yomin >yomin &&
git-update-cache --add nitfol bozbar rezrov &&
echo treeH $treeH &&
git-ls-tree $treeH &&
- echo gnusto >bozbar &&
+ cat bozbar-new >bozbar &&
git-update-cache --add frotz bozbar --force-remove rezrov &&
git-ls-files --stage >M.out &&
treeM=`git-write-tree` &&
git-ls-tree $treeM &&
git-diff-tree $treeH $treeM'
+# "read-tree -m H I+H M" but I is empty so this is "read-tree -m H H M".
+#
+# bozbar [O && A && B && O==A && O!=B (#14) ==> B] take M by read-tree
+# frotz [!O && !A && B (#2) ==> B] take M by read-tree
+# nitfol [O && A && B && O==A && O==B (#15) ==> B] take M by read-tree
+# rezrov [O && A && !B && O==A (#10) ==> no merge] removed by script
+#
+# Earlier one did not have #2ALT so taking M was done by the script,
+# which also updated the work tree and making frotz clean. With #2ALT,
+# this is resolved by read-tree itself and the path is left dirty
+# because we are not testing "read-tree -u --emu23".
test_expect_success \
'1, 2, 3 - no carry forward' \
'rm -f .git/index &&
git-ls-files --stage >1-3.out &&
diff -u M.out 1-3.out &&
check_cache_at bozbar dirty &&
- check_cache_at frotz clean && # different from pure 2-way
+ check_cache_at frotz dirty && # same as pure 2-way again.
check_cache_at nitfol dirty'
echo '+100644 X 0 yomin' >expected
test_expect_success \
'4 - carry forward local addition.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
git-update-cache --add yomin &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >4.out || exit
check_cache_at yomin clean'
# "read-tree -m H I+H M" where !H && !M; so (I+H) not being up-to-date
-# should not matter, but without #3ALT this does not work.
-: test_expect_success \
+# should not matter. Thanks to #3ALT, this is now possible.
+test_expect_success \
'5 - carry forward local addition.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo yomin >yomin &&
git-update-cache --add yomin &&
echo yomin yomin >yomin &&
test_expect_success \
'6 - local addition already has the same.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
git-update-cache --add frotz &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >6.out &&
test_expect_success \
'7 - local addition already has the same.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo frotz >frotz &&
git-update-cache --add frotz &&
echo frotz frotz >frotz &&
test_expect_success \
'8 - conflicting addition.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo frotz frotz >frotz &&
git-update-cache --add frotz &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
test_expect_success \
'9 - conflicting addition.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo frotz frotz >frotz &&
git-update-cache --add frotz &&
echo frotz >frotz &&
test_expect_success \
'10 - path removed.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo rezrov >rezrov &&
git-update-cache --add rezrov &&
read_tree_twoway $treeH $treeM &&
test_expect_success \
'11 - dirty path removed.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo rezrov >rezrov &&
git-update-cache --add rezrov &&
echo rezrov rezrov >rezrov &&
test_expect_success \
'12 - unmatching local changes being removed.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo rezrov rezrov >rezrov &&
git-update-cache --add rezrov &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
test_expect_success \
'13 - unmatching local changes being removed.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo rezrov rezrov >rezrov &&
git-update-cache --add rezrov &&
echo rezrov >rezrov &&
test_expect_success \
'14 - unchanged in two heads.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo nitfol nitfol >nitfol &&
git-update-cache --add nitfol &&
read_tree_twoway $treeH $treeM &&
test_expect_success \
'15 - unchanged in two heads.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo nitfol nitfol >nitfol &&
git-update-cache --add nitfol &&
echo nitfol nitfol nitfol >nitfol &&
# This is different from straight 2-way merge in that it leaves
# three stages of bozbar in the index file without failing, so
# the user can run git-diff-stages to examine the situation.
+# With #2ALT, frotz is resolved internally.
test_expect_success \
'16 - conflicting local change.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo bozbar bozbar >bozbar &&
git-update-cache --add bozbar &&
git-read-tree --emu23 $treeH $treeM &&
100644 X 1 bozbar
100644 X 2 bozbar
100644 X 3 bozbar
-100644 X 3 frotz
+100644 X 0 frotz
100644 X 0 nitfol
100644 X 1 rezrov
100644 X 2 rezrov
test_expect_success \
'17 - conflicting local change.' \
'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
echo bozbar bozbar >bozbar &&
git-update-cache --add bozbar &&
echo bozbar bozbar bozbar >bozbar &&
test_expect_success \
'18 - local change already having a good result.' \
'rm -f .git/index &&
- echo gnusto >bozbar &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
+ cat bozbar-new >bozbar &&
git-update-cache --add bozbar &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >18.out &&
test_expect_success \
'19 - local change already having a good result, further modified.' \
'rm -f .git/index &&
- echo gnusto >bozbar &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
+ cat bozbar-new >bozbar &&
git-update-cache --add bozbar &&
echo gnusto gnusto >bozbar &&
read_tree_twoway $treeH $treeM &&
test_expect_success \
'20 - no local change, use new tree.' \
'rm -f .git/index &&
- echo bozbar >bozbar &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
+ cat bozbar-old >bozbar &&
git-update-cache --add bozbar &&
read_tree_twoway $treeH $treeM &&
git-ls-files --stage >20.out &&
test_expect_success \
'21 - no local change, dirty cache.' \
'rm -f .git/index &&
- echo bozbar >bozbar &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
+ cat bozbar-old >bozbar &&
git-update-cache --add bozbar &&
echo gnusto gnusto >bozbar &&
if read_tree_twoway $treeH $treeM; then false; else :; fi'
+echo '-100644 X 0 bozbar
++100644 X 0 bozbar' >expected
+
+# This fails with straight two-way fast forward, but emu23
+# can merge them.
+test_expect_success \
+ '22 - local change cache updated.' \
+ 'rm -f .git/index &&
+ git-read-tree $treeH &&
+ git-checkout-cache -u -f -q -a &&
+ sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
+ git-update-cache --add bozbar &&
+ read_tree_twoway $treeH $treeM &&
+ git-ls-files --stage >22.out || exit
+ diff -u M.out 22.out >22diff.out
+ compare_change 22diff.out &&
+ check_cache_at bozbar clean'
+
# Also make sure we did not break DF vs DF/DF case.
test_expect_success \
'DF vs DF/DF case setup.' \
treeDF=`git-write-tree` &&
echo treeDF $treeDF &&
git-ls-tree $treeDF &&
+ git-ls-files --stage >DF.out
rm -f DF &&
mkdir DF &&
git-ls-files --stage >DFDF.out'
test_expect_success \
- 'DF vs DF/DF case test.' \
+ 'DF vs DF/DF case test (#1)' \
'rm -f .git/index &&
rm -fr DF &&
echo DF >DF &&
check_cache_at DF/DF clean && # different from pure 2-way
:'
+# The other way around
+test_expect_success \
+ 'DF vs DF/DF case test (#2)' \
+ 'rm -f .git/index &&
+ rm -fr DF &&
+ mkdir DF &&
+ echo DF/DF >DF/DF &&
+ git-update-cache --add DF/DF &&
+ read_tree_twoway $treeDFDF $treeDF &&
+ git-ls-files --stage >DFDFcheck.out &&
+ diff -u DF.out DFDFcheck.out &&
+ check_cache_at DF clean && # different from pure 2-way
+ :'
+
+# Emu23 can grok I having more than H. Make sure we did not
+# botch the conflict tests (fixed).
+test_expect_success \
+ 'DF vs DF/DF case test (#3).' \
+ 'rm -f .git/index &&
+ rm -fr DF &&
+ mkdir DF &&
+ echo DF/DF >DF/DF &&
+ git-update-cache --add DF/DF &&
+ # This should fail because I and H have a conflict
+ # at DF.
+ if git-read-tree --emu23 $treeDF $treeDFDF
+ then false
+ else true
+ fi'
+
test_done