mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +01:00
47a528ad24
Converts tests between t7201-t9001. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
48 lines
1,002 B
Bash
Executable file
48 lines
1,002 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git merge
|
|
|
|
Testing the resolve strategy.'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo c0 > c0.c &&
|
|
git add c0.c &&
|
|
git commit -m c0 &&
|
|
git tag c0 &&
|
|
echo c1 > c1.c &&
|
|
git add c1.c &&
|
|
git commit -m c1 &&
|
|
git tag c1 &&
|
|
git reset --hard c0 &&
|
|
echo c2 > c2.c &&
|
|
git add c2.c &&
|
|
git commit -m c2 &&
|
|
git tag c2 &&
|
|
git reset --hard c0 &&
|
|
echo c3 > c2.c &&
|
|
git add c2.c &&
|
|
git commit -m c3 &&
|
|
git tag c3
|
|
'
|
|
|
|
test_expect_success 'merge c1 to c2' '
|
|
git reset --hard c1 &&
|
|
git merge -s resolve c2 &&
|
|
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
|
|
test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
|
|
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
|
|
git diff --exit-code &&
|
|
test -f c0.c &&
|
|
test -f c1.c &&
|
|
test -f c2.c &&
|
|
test 3 = $(git ls-tree -r HEAD | wc -l) &&
|
|
test 3 = $(git ls-files | wc -l)
|
|
'
|
|
|
|
test_expect_success 'merge c2 to c3 (fails)' '
|
|
git reset --hard c2 &&
|
|
test_must_fail git merge -s resolve c3
|
|
'
|
|
test_done
|