|
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='merge-recursive backend test'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup 1' '
|
|
|
|
|
|
|
|
|
|
echo hello >a &&
|
|
|
|
|
o0=$(git hash-object a) &&
|
|
|
|
|
cp a b &&
|
|
|
|
|
cp a c &&
|
|
|
|
|
mkdir d &&
|
|
|
|
|
cp a d/e &&
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
git add a b c d/e &&
|
|
|
|
|
git commit -m initial &&
|
|
|
|
|
c0=$(git rev-parse --verify HEAD) &&
|
|
|
|
|
git branch side &&
|
|
|
|
|
git branch df-1 &&
|
|
|
|
|
git branch df-2 &&
|
|
|
|
|
git branch df-3 &&
|
|
|
|
|
git branch remove &&
|
|
|
|
|
|
|
|
|
|
echo hello >>a &&
|
|
|
|
|
cp a d/e &&
|
|
|
|
|
o1=$(git hash-object a) &&
|
|
|
|
|
|
|
|
|
|
git add a d/e &&
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -m "master modifies a and d/e" &&
|
|
|
|
|
c1=$(git rev-parse --verify HEAD) &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o1 a"
|
|
|
|
|
echo "100644 blob $o0 b"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o1 d/e"
|
|
|
|
|
echo "100644 $o1 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o1 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup 2' '
|
|
|
|
|
|
|
|
|
|
rm -rf [abcd] &&
|
|
|
|
|
git checkout side &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o0 a"
|
|
|
|
|
echo "100644 blob $o0 b"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o0 d/e"
|
|
|
|
|
echo "100644 $o0 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o0 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
|
|
|
|
|
echo goodbye >>a &&
|
|
|
|
|
o2=$(git hash-object a) &&
|
|
|
|
|
|
|
|
|
|
git add a &&
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -m "side modifies a" &&
|
|
|
|
|
c2=$(git rev-parse --verify HEAD) &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o2 a"
|
|
|
|
|
echo "100644 blob $o0 b"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o0 d/e"
|
|
|
|
|
echo "100644 $o2 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o0 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup 3' '
|
|
|
|
|
|
|
|
|
|
rm -rf [abcd] &&
|
|
|
|
|
git checkout df-1 &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o0 a"
|
|
|
|
|
echo "100644 blob $o0 b"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o0 d/e"
|
|
|
|
|
echo "100644 $o0 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o0 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
|
|
|
|
|
rm -f b && mkdir b && echo df-1 >b/c && git add b/c &&
|
|
|
|
|
o3=$(git hash-object b/c) &&
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -m "df-1 makes b/c" &&
|
|
|
|
|
c3=$(git rev-parse --verify HEAD) &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o0 a"
|
|
|
|
|
echo "100644 blob $o3 b/c"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o0 d/e"
|
|
|
|
|
echo "100644 $o0 0 a"
|
|
|
|
|
echo "100644 $o3 0 b/c"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o0 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup 4' '
|
|
|
|
|
|
|
|
|
|
rm -rf [abcd] &&
|
|
|
|
|
git checkout df-2 &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o0 a"
|
|
|
|
|
echo "100644 blob $o0 b"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o0 d/e"
|
|
|
|
|
echo "100644 $o0 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o0 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
|
|
|
|
|
rm -f a && mkdir a && echo df-2 >a/c && git add a/c &&
|
|
|
|
|
o4=$(git hash-object a/c) &&
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -m "df-2 makes a/c" &&
|
|
|
|
|
c4=$(git rev-parse --verify HEAD) &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o4 a/c"
|
|
|
|
|
echo "100644 blob $o0 b"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o0 d/e"
|
|
|
|
|
echo "100644 $o4 0 a/c"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o0 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup 5' '
|
|
|
|
|
|
|
|
|
|
rm -rf [abcd] &&
|
|
|
|
|
git checkout remove &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o0 a"
|
|
|
|
|
echo "100644 blob $o0 b"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o0 d/e"
|
|
|
|
|
echo "100644 $o0 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o0 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
|
|
|
|
|
rm -f b &&
|
|
|
|
|
echo remove-conflict >a &&
|
|
|
|
|
|
|
|
|
|
git add a &&
|
|
|
|
|
git rm b &&
|
|
|
|
|
o5=$(git hash-object a) &&
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -m "remove removes b and modifies a" &&
|
|
|
|
|
c5=$(git rev-parse --verify HEAD) &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o5 a"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o0 d/e"
|
|
|
|
|
echo "100644 $o5 0 a"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o0 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup 6' '
|
|
|
|
|
|
|
|
|
|
rm -rf [abcd] &&
|
|
|
|
|
git checkout df-3 &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o0 a"
|
|
|
|
|
echo "100644 blob $o0 b"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o0 d/e"
|
|
|
|
|
echo "100644 $o0 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o0 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
|
|
|
|
|
rm -fr d && echo df-3 >d && git add d &&
|
|
|
|
|
o6=$(git hash-object d) &&
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -m "df-3 makes d" &&
|
|
|
|
|
c6=$(git rev-parse --verify HEAD) &&
|
|
|
|
|
( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 blob $o0 a"
|
|
|
|
|
echo "100644 blob $o0 b"
|
|
|
|
|
echo "100644 blob $o0 c"
|
|
|
|
|
echo "100644 blob $o6 d"
|
|
|
|
|
echo "100644 $o0 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o6 0 d"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive simple' '
|
|
|
|
|
|
|
|
|
|
rm -fr [abcd] &&
|
|
|
|
|
git checkout -f "$c2" &&
|
|
|
|
|
|
|
|
|
|
git merge-recursive "$c0" -- "$c2" "$c1"
|
|
|
|
|
status=$?
|
|
|
|
|
case "$status" in
|
|
|
|
|
1)
|
|
|
|
|
: happy
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo >&2 "why status $status!!!"
|
|
|
|
|
false
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive result' '
|
|
|
|
|
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o0 1 a"
|
|
|
|
|
echo "100644 $o2 2 a"
|
|
|
|
|
echo "100644 $o1 3 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o1 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
merge: fix numerus bugs around "trivial merge" area
The "trivial merge" codepath wants to optimize itself by making an
internal call to the read-tree machinery, but it does not read the index
before doing so, and the codepath is never exercised. Incidentally, this
failure to read the index upfront means that the safety to refuse doing
anything when the index is unmerged does not kick in, either.
These two problem are fixed by using read_cache_unmerged() that does read
the index before checking if it is unmerged at the beginning of
cmd_merge().
The primary logic of the merge, however, assumes that the process never
reads the index in-core, and the call to write_cache_as_tree() it makes
from write_tree_trivial() will always read from the on-disk index that is
prepared the strategy back-ends. This assumption is now broken by the
above fix. To fix this issue, we now call discard_cache() before calling
write_tree_trivial() when it wants to write the on-disk index as a tree.
When multiple strategies are tried, their results are evaluated by reading
the resulting index and inspecting it. The codepath needs to make a call
to read_cache() for each successful strategy, and for that to work, they
need to discard_cache() the one read by the previous round.
Also the "trivial merge" forgot that the current commit is one of the
parents of the resulting commit.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
|
|
|
test_expect_success 'fail if the index has unresolved entries' '
|
|
|
|
|
|
|
|
|
|
rm -fr [abcd] &&
|
|
|
|
|
git checkout -f "$c1" &&
|
|
|
|
|
|
|
|
|
|
test_must_fail git merge "$c5" &&
|
|
|
|
|
test_must_fail git merge "$c5" 2> out &&
|
|
|
|
|
grep "You have not concluded your merge" out &&
|
|
|
|
|
rm -f .git/MERGE_HEAD &&
|
|
|
|
|
test_must_fail git merge "$c5" 2> out &&
|
merge: fix numerus bugs around "trivial merge" area
The "trivial merge" codepath wants to optimize itself by making an
internal call to the read-tree machinery, but it does not read the index
before doing so, and the codepath is never exercised. Incidentally, this
failure to read the index upfront means that the safety to refuse doing
anything when the index is unmerged does not kick in, either.
These two problem are fixed by using read_cache_unmerged() that does read
the index before checking if it is unmerged at the beginning of
cmd_merge().
The primary logic of the merge, however, assumes that the process never
reads the index in-core, and the call to write_cache_as_tree() it makes
from write_tree_trivial() will always read from the on-disk index that is
prepared the strategy back-ends. This assumption is now broken by the
above fix. To fix this issue, we now call discard_cache() before calling
write_tree_trivial() when it wants to write the on-disk index as a tree.
When multiple strategies are tried, their results are evaluated by reading
the resulting index and inspecting it. The codepath needs to make a call
to read_cache() for each successful strategy, and for that to work, they
need to discard_cache() the one read by the previous round.
Also the "trivial merge" forgot that the current commit is one of the
parents of the resulting commit.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
|
|
|
grep "You are in the middle of a conflicted merge" out
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive remove conflict' '
|
|
|
|
|
|
|
|
|
|
rm -fr [abcd] &&
|
|
|
|
|
git checkout -f "$c1" &&
|
|
|
|
|
|
|
|
|
|
git merge-recursive "$c0" -- "$c1" "$c5"
|
|
|
|
|
status=$?
|
|
|
|
|
case "$status" in
|
|
|
|
|
1)
|
|
|
|
|
: happy
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo >&2 "why status $status!!!"
|
|
|
|
|
false
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive remove conflict' '
|
|
|
|
|
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o0 1 a"
|
|
|
|
|
echo "100644 $o1 2 a"
|
|
|
|
|
echo "100644 $o5 3 a"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o1 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive d/f simple' '
|
|
|
|
|
rm -fr [abcd] &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git checkout -f "$c1" &&
|
|
|
|
|
|
|
|
|
|
git merge-recursive "$c0" -- "$c1" "$c3"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive result' '
|
|
|
|
|
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o1 0 a"
|
|
|
|
|
echo "100644 $o3 0 b/c"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o1 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive d/f conflict' '
|
|
|
|
|
|
|
|
|
|
rm -fr [abcd] &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git checkout -f "$c1" &&
|
|
|
|
|
|
|
|
|
|
git merge-recursive "$c0" -- "$c1" "$c4"
|
|
|
|
|
status=$?
|
|
|
|
|
case "$status" in
|
|
|
|
|
1)
|
|
|
|
|
: happy
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo >&2 "why status $status!!!"
|
|
|
|
|
false
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive d/f conflict result' '
|
|
|
|
|
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o0 1 a"
|
|
|
|
|
echo "100644 $o1 2 a"
|
|
|
|
|
echo "100644 $o4 0 a/c"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o1 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive d/f conflict the other way' '
|
|
|
|
|
|
|
|
|
|
rm -fr [abcd] &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git checkout -f "$c4" &&
|
|
|
|
|
|
|
|
|
|
git merge-recursive "$c0" -- "$c4" "$c1"
|
|
|
|
|
status=$?
|
|
|
|
|
case "$status" in
|
|
|
|
|
1)
|
|
|
|
|
: happy
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo >&2 "why status $status!!!"
|
|
|
|
|
false
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive d/f conflict result the other way' '
|
|
|
|
|
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o0 1 a"
|
|
|
|
|
echo "100644 $o1 3 a"
|
|
|
|
|
echo "100644 $o4 0 a/c"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o1 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive d/f conflict' '
|
|
|
|
|
|
|
|
|
|
rm -fr [abcd] &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git checkout -f "$c1" &&
|
|
|
|
|
|
|
|
|
|
git merge-recursive "$c0" -- "$c1" "$c6"
|
|
|
|
|
status=$?
|
|
|
|
|
case "$status" in
|
|
|
|
|
1)
|
|
|
|
|
: happy
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo >&2 "why status $status!!!"
|
|
|
|
|
false
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive d/f conflict result' '
|
|
|
|
|
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o1 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o6 3 d"
|
|
|
|
|
echo "100644 $o0 1 d/e"
|
|
|
|
|
echo "100644 $o1 2 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive d/f conflict' '
|
|
|
|
|
|
|
|
|
|
rm -fr [abcd] &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git checkout -f "$c6" &&
|
|
|
|
|
|
|
|
|
|
git merge-recursive "$c0" -- "$c6" "$c1"
|
|
|
|
|
status=$?
|
|
|
|
|
case "$status" in
|
|
|
|
|
1)
|
|
|
|
|
: happy
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo >&2 "why status $status!!!"
|
|
|
|
|
false
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge-recursive d/f conflict result' '
|
|
|
|
|
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o1 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o6 2 d"
|
|
|
|
|
echo "100644 $o0 1 d/e"
|
|
|
|
|
echo "100644 $o1 3 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'reset and 3-way merge' '
|
|
|
|
|
|
|
|
|
|
git reset --hard "$c2" &&
|
|
|
|
|
git read-tree -m "$c0" "$c2" "$c1"
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'reset and bind merge' '
|
|
|
|
|
|
|
|
|
|
git reset --hard master &&
|
|
|
|
|
git read-tree --prefix=M/ master &&
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o1 0 M/a"
|
|
|
|
|
echo "100644 $o0 0 M/b"
|
|
|
|
|
echo "100644 $o0 0 M/c"
|
|
|
|
|
echo "100644 $o1 0 M/d/e"
|
|
|
|
|
echo "100644 $o1 0 a"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o1 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual &&
|
|
|
|
|
|
|
|
|
|
git read-tree --prefix=a1/ master &&
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o1 0 M/a"
|
|
|
|
|
echo "100644 $o0 0 M/b"
|
|
|
|
|
echo "100644 $o0 0 M/c"
|
|
|
|
|
echo "100644 $o1 0 M/d/e"
|
|
|
|
|
echo "100644 $o1 0 a"
|
|
|
|
|
echo "100644 $o1 0 a1/a"
|
|
|
|
|
echo "100644 $o0 0 a1/b"
|
|
|
|
|
echo "100644 $o0 0 a1/c"
|
|
|
|
|
echo "100644 $o1 0 a1/d/e"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o1 0 d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
git read-tree --prefix=z/ master &&
|
|
|
|
|
git ls-files -s >actual &&
|
|
|
|
|
(
|
|
|
|
|
echo "100644 $o1 0 M/a"
|
|
|
|
|
echo "100644 $o0 0 M/b"
|
|
|
|
|
echo "100644 $o0 0 M/c"
|
|
|
|
|
echo "100644 $o1 0 M/d/e"
|
|
|
|
|
echo "100644 $o1 0 a"
|
|
|
|
|
echo "100644 $o1 0 a1/a"
|
|
|
|
|
echo "100644 $o0 0 a1/b"
|
|
|
|
|
echo "100644 $o0 0 a1/c"
|
|
|
|
|
echo "100644 $o1 0 a1/d/e"
|
|
|
|
|
echo "100644 $o0 0 b"
|
|
|
|
|
echo "100644 $o0 0 c"
|
|
|
|
|
echo "100644 $o1 0 d/e"
|
|
|
|
|
echo "100644 $o1 0 z/a"
|
|
|
|
|
echo "100644 $o0 0 z/b"
|
|
|
|
|
echo "100644 $o0 0 z/c"
|
|
|
|
|
echo "100644 $o1 0 z/d/e"
|
|
|
|
|
) >expected &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'merge removes empty directories' '
|
|
|
|
|
|
|
|
|
|
git reset --hard master &&
|
|
|
|
|
git checkout -b rm &&
|
|
|
|
|
git rm d/e &&
|
|
|
|
|
git commit -mremoved-d/e &&
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git merge -s recursive rm &&
|
|
|
|
|
test_must_fail test -d d
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_done
|
