summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-10-06 19:00:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-07 01:56:08 (GMT)
commit9c5b2fab304b5ce3233401c7c7e7a123d551c484 (patch)
treee53aea6a3b052ed63bd417d6019bf273439f5d7f /t/t7600-merge.sh
parent217f2767cbcb562872437eed4dec62e00846d90c (diff)
downloadgit-9c5b2fab304b5ce3233401c7c7e7a123d551c484.zip
git-9c5b2fab304b5ce3233401c7c7e7a123d551c484.tar.gz
git-9c5b2fab304b5ce3233401c7c7e7a123d551c484.tar.bz2
tests: fix diff order arguments in test_cmp
Fix the argument order for test_cmp. When given the expected result first the diff shows the actual output with '+' and the expectation with '-', which is the convention for our tests. Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 80194b7..dfde6a6 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -697,7 +697,7 @@ test_expect_success 'merge --no-ff --edit' '
git cat-file commit HEAD >raw &&
grep "work done on the side branch" raw &&
sed "1,/^$/d" >actual raw &&
- test_cmp actual expected
+ test_cmp expected actual
'
test_expect_success GPG 'merge --ff-only tag' '
@@ -709,7 +709,7 @@ test_expect_success GPG 'merge --ff-only tag' '
git merge --ff-only signed &&
git rev-parse signed^0 >expect &&
git rev-parse HEAD >actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
test_expect_success GPG 'merge --no-edit tag should skip editor' '
@@ -721,7 +721,7 @@ test_expect_success GPG 'merge --no-edit tag should skip editor' '
EDITOR=false git merge --no-edit signed &&
git rev-parse signed^0 >expect &&
git rev-parse HEAD^2 >actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
test_expect_success 'set up mod-256 conflict scenario' '