|
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='Two way merge with read-tree --emu23 $H $M
|
|
|
|
|
|
|
|
|
|
This test tries two-way merge (aka fast forward with carry forward).
|
|
|
|
|
|
|
|
|
|
There is the head (called H) and another commit (called M), which is
|
|
|
|
|
simply ahead of H. The index and the work tree contains a state that
|
|
|
|
|
is derived from H, but may also have local changes. This test checks
|
|
|
|
|
all the combinations described in the two-tree merge "carry forward"
|
|
|
|
|
rules, found in <Documentation/git-rev-tree.txt>.
|
|
|
|
|
|
|
|
|
|
In the test, these paths are used:
|
|
|
|
|
bozbar - in H, stays in M, modified from bozbar to gnusto
|
|
|
|
|
frotz - not in H added in M
|
|
|
|
|
nitfol - in H, stays in M unmodified
|
|
|
|
|
rezrov - in H, deleted in M
|
|
|
|
|
yomin - not in H nor M
|
|
|
|
|
'
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
read_tree_twoway () {
|
|
|
|
|
git-read-tree --emu23 "$1" "$2" &&
|
|
|
|
|
git-ls-files --stage &&
|
|
|
|
|
git-merge-cache git-merge-one-file-script -a &&
|
|
|
|
|
git-ls-files --stage
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_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' \
|
|
|
|
|
"$1"
|
|
|
|
|
diff -u expected current
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_cache_at () {
|
|
|
|
|
clean_if_empty=`git-diff-files "$1"`
|
|
|
|
|
case "$clean_if_empty" in
|
|
|
|
|
'') echo "$1: clean" ;;
|
|
|
|
|
?*) echo "$1: dirty" ;;
|
|
|
|
|
esac
|
|
|
|
|
case "$2,$clean_if_empty" in
|
|
|
|
|
clean,) : ;;
|
|
|
|
|
clean,?*) false ;;
|
|
|
|
|
dirty,) false ;;
|
|
|
|
|
dirty,?*) : ;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_stages () {
|
|
|
|
|
cat >expected_stages
|
|
|
|
|
git-ls-files --stage | sed -e "s/ $_x40 / X /" >current_stages
|
|
|
|
|
diff -u expected_stages current_stages
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
setup \
|
|
|
|
|
'echo frotz >frotz &&
|
|
|
|
|
echo nitfol >nitfol &&
|
|
|
|
|
echo bozbar >bozbar &&
|
|
|
|
|
echo rezrov >rezrov &&
|
|
|
|
|
echo yomin >yomin &&
|
|
|
|
|
git-update-cache --add nitfol bozbar rezrov &&
|
|
|
|
|
treeH=`git-write-tree` &&
|
|
|
|
|
echo treeH $treeH &&
|
|
|
|
|
git-ls-tree $treeH &&
|
|
|
|
|
|
|
|
|
|
echo gnusto >bozbar &&
|
|
|
|
|
git-update-cache --add frotz bozbar --force-remove rezrov &&
|
|
|
|
|
git-ls-files --stage >M.out &&
|
|
|
|
|
treeM=`git-write-tree` &&
|
|
|
|
|
echo treeM $treeM &&
|
|
|
|
|
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 &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >1-3.out &&
|
|
|
|
|
diff -u M.out 1-3.out &&
|
|
|
|
|
check_cache_at bozbar dirty &&
|
|
|
|
|
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-update-cache --add yomin &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >4.out || exit
|
|
|
|
|
diff -u M.out 4.out >4diff.out
|
|
|
|
|
compare_change 4diff.out expected &&
|
|
|
|
|
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. Thanks to #3ALT, this is now possible.
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'5 - carry forward local addition.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo yomin >yomin &&
|
|
|
|
|
git-update-cache --add yomin &&
|
|
|
|
|
echo yomin yomin >yomin &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >5.out || exit
|
|
|
|
|
diff -u M.out 5.out >5diff.out
|
|
|
|
|
compare_change 5diff.out expected &&
|
|
|
|
|
check_cache_at yomin dirty'
|
|
|
|
|
|
|
|
|
|
# "read-tree -m H I+H M" where !H && M && (I+H) == M, so this should
|
[PATCH] read-tree: fix too strong index requirement #5ALT
This fixes too strong index requirement 3-way merge enforces in
one case: the same file is added in both branches.
In this case, the original code insisted that if the index file
has that path, it must match our branch and be up-to-date.
However in this particular case, it only has to match it, and
can be dirty. We just need to make sure that we keep the
work-tree copy instead of checking out the merge result.
The resolution of such a path, however, cannot be left to
outside script, because we will not keep the original stage0
entries for unmerged paths when read-tree finishes, and at that
point, the knowledge of "if we resolve it to match the new file
added in both branches, the merge succeeds and the work tree
would not lose information, but we should _not_ update the work
tree from the resulting index file" is lost. For this reason,
the now code needs to resolve this case (#5ALT) internally.
This affects some existing tests in the test suite, but all in
positive ways. In t1000 (3-way test), this #5ALT case now gets
one stage0 entry, instead of an identical stage2 and stage3
entry pair, for such a path, and one test that checked for merge
failure (because the test assumed the "stricter-than-necessary"
behaviour) does not have to fail anymore. In t1005 (emu23
test), two tests that involves a case where the work tree
already had a change introduced in the upstream (aka "merged
head"), the merge succeeds instead of failing.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
20 years ago
|
|
|
# succeed (even the entry is clean), now thanks to #5ALT.
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'6 - local addition already has the same.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
git-update-cache --add frotz &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >6.out &&
|
|
|
|
|
diff -u M.out 6.out &&
|
|
|
|
|
check_cache_at frotz clean'
|
|
|
|
|
|
|
|
|
|
# Exactly the same pattern as above but with dirty cache. This also
|
[PATCH] read-tree: fix too strong index requirement #5ALT
This fixes too strong index requirement 3-way merge enforces in
one case: the same file is added in both branches.
In this case, the original code insisted that if the index file
has that path, it must match our branch and be up-to-date.
However in this particular case, it only has to match it, and
can be dirty. We just need to make sure that we keep the
work-tree copy instead of checking out the merge result.
The resolution of such a path, however, cannot be left to
outside script, because we will not keep the original stage0
entries for unmerged paths when read-tree finishes, and at that
point, the knowledge of "if we resolve it to match the new file
added in both branches, the merge succeeds and the work tree
would not lose information, but we should _not_ update the work
tree from the resulting index file" is lost. For this reason,
the now code needs to resolve this case (#5ALT) internally.
This affects some existing tests in the test suite, but all in
positive ways. In t1000 (3-way test), this #5ALT case now gets
one stage0 entry, instead of an identical stage2 and stage3
entry pair, for such a path, and one test that checked for merge
failure (because the test assumed the "stricter-than-necessary"
behaviour) does not have to fail anymore. In t1005 (emu23
test), two tests that involves a case where the work tree
already had a change introduced in the upstream (aka "merged
head"), the merge succeeds instead of failing.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
20 years ago
|
|
|
# should succeed, now thanks to #5ALT.
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'7 - local addition already has the same.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo frotz >frotz &&
|
|
|
|
|
git-update-cache --add frotz &&
|
|
|
|
|
echo frotz frotz >frotz &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >7.out &&
|
|
|
|
|
diff -u M.out 7.out &&
|
|
|
|
|
check_cache_at frotz dirty'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'8 - conflicting addition.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
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 &&
|
|
|
|
|
echo frotz frotz >frotz &&
|
|
|
|
|
git-update-cache --add frotz &&
|
|
|
|
|
echo frotz >frotz &&
|
|
|
|
|
if read_tree_twoway $treeH $treeM; then false; else :; fi'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'10 - path removed.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo rezrov >rezrov &&
|
|
|
|
|
git-update-cache --add rezrov &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >10.out &&
|
|
|
|
|
diff -u M.out 10.out'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'11 - dirty path removed.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo rezrov >rezrov &&
|
|
|
|
|
git-update-cache --add rezrov &&
|
|
|
|
|
echo rezrov rezrov >rezrov &&
|
|
|
|
|
if read_tree_twoway $treeH $treeM; then false; else :; fi'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'12 - unmatching local changes being removed.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
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 &&
|
|
|
|
|
echo rezrov rezrov >rezrov &&
|
|
|
|
|
git-update-cache --add rezrov &&
|
|
|
|
|
echo rezrov >rezrov &&
|
|
|
|
|
if read_tree_twoway $treeH $treeM; then false; else :; fi'
|
|
|
|
|
|
|
|
|
|
cat >expected <<EOF
|
|
|
|
|
-100644 X 0 nitfol
|
|
|
|
|
+100644 X 0 nitfol
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'14 - unchanged in two heads.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo nitfol nitfol >nitfol &&
|
|
|
|
|
git-update-cache --add nitfol &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >14.out || exit
|
|
|
|
|
diff -u M.out 14.out >14diff.out
|
|
|
|
|
compare_change 14diff.out expected &&
|
|
|
|
|
check_cache_at nitfol clean'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'15 - unchanged in two heads.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo nitfol nitfol >nitfol &&
|
|
|
|
|
git-update-cache --add nitfol &&
|
|
|
|
|
echo nitfol nitfol nitfol >nitfol &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >15.out || exit
|
|
|
|
|
diff -u M.out 15.out >15diff.out
|
|
|
|
|
compare_change 15diff.out expected &&
|
|
|
|
|
check_cache_at nitfol dirty'
|
|
|
|
|
|
|
|
|
|
# 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 &&
|
|
|
|
|
echo bozbar bozbar >bozbar &&
|
|
|
|
|
git-update-cache --add bozbar &&
|
|
|
|
|
git-read-tree --emu23 $treeH $treeM &&
|
|
|
|
|
check_stages' <<\EOF
|
|
|
|
|
100644 X 1 bozbar
|
|
|
|
|
100644 X 2 bozbar
|
|
|
|
|
100644 X 3 bozbar
|
|
|
|
|
100644 X 0 frotz
|
|
|
|
|
100644 X 0 nitfol
|
|
|
|
|
100644 X 1 rezrov
|
|
|
|
|
100644 X 2 rezrov
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'17 - conflicting local change.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo bozbar bozbar >bozbar &&
|
|
|
|
|
git-update-cache --add bozbar &&
|
|
|
|
|
echo bozbar bozbar bozbar >bozbar &&
|
|
|
|
|
if read_tree_twoway $treeH $treeM; then false; else :; fi'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'18 - local change already having a good result.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo gnusto >bozbar &&
|
|
|
|
|
git-update-cache --add bozbar &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >18.out &&
|
|
|
|
|
diff -u M.out 18.out &&
|
|
|
|
|
check_cache_at bozbar clean'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'19 - local change already having a good result, further modified.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo gnusto >bozbar &&
|
|
|
|
|
git-update-cache --add bozbar &&
|
|
|
|
|
echo gnusto gnusto >bozbar &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >19.out &&
|
|
|
|
|
diff -u M.out 19.out &&
|
|
|
|
|
check_cache_at bozbar dirty'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'20 - no local change, use new tree.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo bozbar >bozbar &&
|
|
|
|
|
git-update-cache --add bozbar &&
|
|
|
|
|
read_tree_twoway $treeH $treeM &&
|
|
|
|
|
git-ls-files --stage >20.out &&
|
|
|
|
|
diff -u M.out 20.out &&
|
|
|
|
|
check_cache_at bozbar dirty'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'21 - no local change, dirty cache.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo bozbar >bozbar &&
|
|
|
|
|
git-update-cache --add bozbar &&
|
|
|
|
|
echo gnusto gnusto >bozbar &&
|
|
|
|
|
if read_tree_twoway $treeH $treeM; then false; else :; fi'
|
|
|
|
|
|
|
|
|
|
# Also make sure we did not break DF vs DF/DF case.
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'DF vs DF/DF case setup.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
echo DF >DF &&
|
|
|
|
|
git-update-cache --add DF &&
|
|
|
|
|
treeDF=`git-write-tree` &&
|
|
|
|
|
echo treeDF $treeDF &&
|
|
|
|
|
git-ls-tree $treeDF &&
|
|
|
|
|
|
|
|
|
|
rm -f DF &&
|
|
|
|
|
mkdir DF &&
|
|
|
|
|
echo DF/DF >DF/DF &&
|
|
|
|
|
git-update-cache --add --remove DF DF/DF &&
|
|
|
|
|
treeDFDF=`git-write-tree` &&
|
|
|
|
|
echo treeDFDF $treeDFDF &&
|
|
|
|
|
git-ls-tree $treeDFDF &&
|
|
|
|
|
git-ls-files --stage >DFDF.out'
|
|
|
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
|
'DF vs DF/DF case test.' \
|
|
|
|
|
'rm -f .git/index &&
|
|
|
|
|
rm -fr DF &&
|
|
|
|
|
echo DF >DF &&
|
|
|
|
|
git-update-cache --add DF &&
|
|
|
|
|
read_tree_twoway $treeDF $treeDFDF &&
|
|
|
|
|
git-ls-files --stage >DFDFcheck.out &&
|
|
|
|
|
diff -u DFDF.out DFDFcheck.out &&
|
|
|
|
|
check_cache_at DF/DF clean && # different from pure 2-way
|
|
|
|
|
:'
|
|
|
|
|
|
|
|
|
|
test_done
|
