undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7606 (merge-theirs): modernize style

Browse Source 
Guard setup commands with test_expect_success, so they are easier
to visually skip over and get to the good part.  While at it:

 - use test_commit for brevity and reproducible object names;

 - use test_cmp instead of using the test builtin to compare the
   result of command substitution, for better output with -v on
   failure.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-08-15 20:08:46 -05:00 committed by Junio C Hamano
parent 64fdc08dac
commit 6209036c78
1 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
t/t7606-merge-custom.sh
View File

@ -1,46 +1,60 @@
#!/bin/sh #!/bin/sh
test_description='git merge test_description="git merge
Testing a custom strategy.' Testing a custom strategy.
* (HEAD, master) Merge commit 'c2'
|\
| * (tag: c2) c2
* | (tag: c1) c1
|/
* (tag: c0) c0
"
. ./test-lib.sh . ./test-lib.sh
cat >git-merge-theirs <<EOF test_expect_success 'set up custom strategy' '
#!$SHELL_PATH cat >git-merge-theirs <<-EOF &&
eval git read-tree --reset -u \\\$\$# #!$SHELL_PATH
EOF eval git read-tree --reset -u \\\$\$#
chmod +x git-merge-theirs EOF
PATH=.:$PATH
export PATH chmod +x git-merge-theirs &&
PATH=.:$PATH &&
export PATH
'
test_expect_success 'setup' ' test_expect_success 'setup' '
echo c0 >c0.c && test_commit c0 c0.c &&
git add c0.c && test_commit c1 c1.c &&
git commit -m c0 && git reset --keep c0 &&
git tag c0 &&
echo c1 >c1.c &&
git add c1.c &&
git commit -m c1 &&
git tag c1 &&
git reset --hard c0 &&
echo c1c1 >c1.c && echo c1c1 >c1.c &&
echo c2 >c2.c && git add c1.c &&
git add c1.c c2.c && test_commit c2 c2.c
git commit -m c2 &&
git tag c2
' '
test_expect_success 'merge c2 with a custom strategy' ' test_expect_success 'merge c2 with a custom strategy' '
git reset --hard c1 && git reset --hard c1 &&
git rev-parse c1 >head.old &&
git rev-parse c2 >second-parent.expected &&
git rev-parse c2^{tree} >tree.expected &&
git merge -s theirs c2 && git merge -s theirs c2 &&
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" && git rev-parse HEAD >head &&
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" && git rev-parse HEAD^1 >first-parent &&
test "$(git rev-parse c2^{tree})" = "$(git rev-parse HEAD^{tree})" && git rev-parse HEAD^2 >second-parent &&
git rev-parse HEAD^{tree} >tree &&
git update-index --refresh &&
git diff --exit-code && git diff --exit-code &&
git diff --exit-code c2 HEAD && git diff --exit-code c2 HEAD &&
git diff --exit-code c2 && git diff --exit-code c2 &&
! test_cmp head.old head &&
test_cmp head.old first-parent &&
test_cmp second-parent.expected second-parent &&
test_cmp tree.expected tree &&
test -f c0.c && test -f c0.c &&
grep c1c1 c1.c && grep c1c1 c1.c &&
test -f c2.c test -f c2.c