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/t7506-status-submodule.sh | |
| parent | Git 2.15-rc0 (diff) | |
| download | git-9c5b2fab304b5ce3233401c7c7e7a123d551c484.tar.gz git-9c5b2fab304b5ce3233401c7c7e7a123d551c484.zip | |
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/t7506-status-submodule.sh')
| -rwxr-xr-x | t/t7506-status-submodule.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh index 055c90736e..9edf6572ed 100755 --- a/t/t7506-status-submodule.sh +++ b/t/t7506-status-submodule.sh @@ -306,7 +306,7 @@ test_expect_success 'diff with merge conflict in .gitmodules' ' cd super && git diff >../diff_actual 2>&1 ) && - test_cmp diff_actual diff_expect + test_cmp diff_expect diff_actual ' test_expect_success 'diff --submodule with merge conflict in .gitmodules' ' @@ -314,7 +314,7 @@ test_expect_success 'diff --submodule with merge conflict in .gitmodules' ' cd super && git diff --submodule >../diff_submodule_actual 2>&1 ) && - test_cmp diff_submodule_actual diff_submodule_expect + test_cmp diff_submodule_expect diff_submodule_actual ' # We'll setup different cases for further testing: |