Merge branch 'rh/merge-options-doc-fix' into maint

diff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh
index 1f859dd908cb298bf89a13822e8fc19882060689..972946c174c18ee831d8595068c6ffa235c8a538 100755 (executable)
--- a/t/t4127-apply-same-fn.sh
+++ b/t/t4127-apply-same-fn.sh
@@ -26,12 +26,12 @@ test_expect_success 'apply same filename with independent changes' '
        git diff >> patch0 &&
        cp same_fn same_fn2 &&
        git reset --hard &&
-       git-apply patch0 &&
-       diff same_fn same_fn2
+       git apply patch0 &&
+       test_cmp same_fn same_fn2
 '
 
 test_expect_success 'apply same filename with overlapping changes' '
-       git reset --hard
+       git reset --hard &&
        modify "s/^d/z/" same_fn &&
        git diff > patch0 &&
        git add same_fn &&
@@ -39,13 +39,13 @@ test_expect_success 'apply same filename with overlapping changes' '
        git diff >> patch0 &&
        cp same_fn same_fn2 &&
        git reset --hard &&
-       git-apply patch0 &&
-       diff same_fn same_fn2
+       git apply patch0 &&
+       test_cmp same_fn same_fn2
 '
 
 test_expect_success 'apply same new filename after rename' '
-       git reset --hard
-       git mv same_fn new_fn
+       git reset --hard &&
+       git mv same_fn new_fn &&
        modify "s/^d/z/" new_fn &&
        git add new_fn &&
        git diff -M --cached > patch1 &&
@@ -54,16 +54,16 @@ test_expect_success 'apply same new filename after rename' '
        cp new_fn new_fn2 &&
        git reset --hard &&
        git apply --index patch1 &&
-       diff new_fn new_fn2
+       test_cmp new_fn new_fn2
 '
 
 test_expect_success 'apply same old filename after rename -- should fail.' '
-       git reset --hard
-       git mv same_fn new_fn
+       git reset --hard &&
+       git mv same_fn new_fn &&
        modify "s/^d/z/" new_fn &&
        git add new_fn &&
        git diff -M --cached > patch1 &&
-       git mv new_fn same_fn
+       git mv new_fn same_fn &&
        modify "s/^e/y/" same_fn &&
        git diff >> patch1 &&
        git reset --hard &&
@@ -71,13 +71,13 @@ test_expect_success 'apply same old filename after rename -- should fail.' '
 '
 
 test_expect_success 'apply A->B (rename), C->A (rename), A->A -- should pass.' '
-       git reset --hard
-       git mv same_fn new_fn
+       git reset --hard &&
+       git mv same_fn new_fn &&
        modify "s/^d/z/" new_fn &&
        git add new_fn &&
        git diff -M --cached > patch1 &&
        git commit -m "a rename" &&
-       git mv other_fn same_fn
+       git mv other_fn same_fn &&
        modify "s/^e/y/" same_fn &&
        git add same_fn &&
        git diff -M --cached >> patch1 &&