am: move advice.amWorkDir parsing back to advice.c

diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 055c90736e9c0cfb60fef7db643f30c7573de581..9edf6572ed3b8f04ef1169f545043fcb2e09fe21 100755 (executable)
--- 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: