t5516-fetch-push: fix 'push with dry-run' test

In a while-at-it cleanup replacing a 'cd dir && <...> && cd ..' with a subshell, commit 28391a80a9 (receive-pack: allow deletion of corrupt refs, 2007-11-29) also moved the assignment of the $old_commit variable to that subshell. This variable, however, is used outside of that subshell as a parameter of check_push_result(), to check that a ref still points to the commit where it is supposed to. With the variable remaining unset outside the subshell check_push_result() doesn't perform that check at all. Use 'git -C <dir> cmd...', so we don't need to change directory, and thus don't need the subshell either when setting $old_commit. Furthermore, change check_push_result() to require at least three parameters (the repo, the oid, and at least one ref), so it will catch similar issues earlier should they ever arise. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

SZEDER Gábor committed May 10, 2018 at 16:01 UTC cfb482b6c33508c3a14b721b1e48a881fcbe7146
1 file changed +4 -4
t/t5516-fetch-push.sh
+4 -4
@@ -94,6 +94,9 @@ mk_child() {
94 }
95
96 check_push_result () {
97 + test $# -ge 3 ||
98 + error "bug in the test script: check_push_result requires at least 3 parameters"
99 +
100 repo_name="$1"
101 shift
102
@@ -553,10 +556,7 @@ test_expect_success 'branch.*.pushremote config order is irrelevant' '
556 test_expect_success 'push with dry-run' '
557
558 mk_test testrepo heads/master &&
556 - (
557 - cd testrepo &&
558 - old_commit=$(git show-ref -s --verify refs/heads/master)
559 - ) &&
559 + old_commit=$(git -C testrepo show-ref -s --verify refs/heads/master) &&
560 git push --dry-run testrepo : &&
561 check_push_result testrepo $old_commit heads/master
562 '