Sync with maint

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 5bcf0b867adf3f57018a15ab8828713b986aaac6..0eace37a03d75a7205575c36a0ec0de3ec401b1b 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -129,7 +129,7 @@ test_expect_success 'denyNonFastforwards trumps --force' '
        test "$victim_orig" = "$victim_head"
 '
 
-test_expect_success 'push --all excludes remote tracking hierarchy' '
+test_expect_success 'push --all excludes remote-tracking hierarchy' '
        mkdir parent &&
        (
            cd parent &&
@@ -190,7 +190,7 @@ test_expect_success 'pushing explicit refspecs respects forcing' '
                +refs/heads/master:refs/heads/master
        ) &&
        parent_head=$(cd parent && git rev-parse --verify master) &&
-       child_head=$(cd parent && git rev-parse --verify master) &&
+       child_head=$(cd child && git rev-parse --verify master) &&
        test "$parent_head" = "$child_head"
 '
 
@@ -210,7 +210,7 @@ test_expect_success 'pushing wildcard refspecs respects forcing' '
                "+refs/heads/*:refs/heads/*"
        ) &&
        parent_head=$(cd parent && git rev-parse --verify master) &&
-       child_head=$(cd parent && git rev-parse --verify master) &&
+       child_head=$(cd child && git rev-parse --verify master) &&
        test "$parent_head" = "$child_head"
 '