[PATCH 1/3] t7506: fix diff order arguments in test_cmp
- From
Stefan Beller <sbeller@google.com>
- Date
- Oct 21, 2016, 23:59 UTC
- Message-ID
- <20161021235939.20792-2-sbeller@google.com>
- In-Reply-To
- <20161021235939.20792-1-sbeller@google.com>
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> --- t/t7506-status-submodule.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh index d31b34d..74cb6b8 100755 --- a/t/t7506-status-submodule.sh +++ b/t/t7506-status-submodule.sh @@ -260,7 +260,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' ' @@ -268,7 +268,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 ' test_done
-- 2.10.1.507.g2a9098a