diff options
| author | Stefan Beller <sbeller@google.com> | 2017-10-06 12:00:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-07 10:56:08 +0900 |
| commit | 9c5b2fab304b5ce3233401c7c7e7a123d551c484 (patch) | |
| tree | e53aea6a3b052ed63bd417d6019bf273439f5d7f /t/t7405-submodule-merge.sh | |
| parent | 217f2767cbcb562872437eed4dec62e00846d90c (diff) | |
| download | git-9c5b2fab304b5ce3233401c7c7e7a123d551c484.tar.gz git-9c5b2fab304b5ce3233401c7c7e7a123d551c484.tar.xz | |
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/t7405-submodule-merge.sh')
| -rwxr-xr-x | t/t7405-submodule-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 0d5b42a25..7bfb2f498 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -119,7 +119,7 @@ test_expect_success 'merge with one side as a fast-forward of the other' ' git ls-tree test-forward sub | cut -f1 | cut -f3 -d" " > actual && (cd sub && git rev-parse sub-d > ../expect) && - test_cmp actual expect) + test_cmp expect actual) ' test_expect_success 'merging should conflict for non fast-forward' ' |