diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 13:11:48 -0700 |
| commit | ec0465ade87996214959a393239eec520daf92ea (patch) | |
| tree | 714fd5f0ab87cba55d894a2031220ff7f5cf1aff /t | |
| parent | Merge branch 'rs/daemon-hostname-in-strbuf' (diff) | |
| parent | t5528: do not fail with FreeBSD shell (diff) | |
| download | tgif-ec0465ade87996214959a393239eec520daf92ea.tar.xz | |
Merge branch 'km/bsd-shells'
Portability fixes and workarounds for shell scripts have been added
to help BSD-derived systems.
* km/bsd-shells:
t5528: do not fail with FreeBSD shell
help.c: use SHELL_PATH instead of hard-coded "/bin/sh"
git-compat-util.h: move SHELL_PATH default into header
git-instaweb: use @SHELL_PATH@ instead of /bin/sh
git-instaweb: allow running in a working tree subdirectory
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5528-push-default.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh index cc7451908b..73f4bb6346 100755 --- a/t/t5528-push-default.sh +++ b/t/t5528-push-default.sh @@ -26,7 +26,7 @@ check_pushed_commit () { # $2 = expected target branch for the push # $3 = [optional] repo to check for actual output (repo1 by default) test_push_success () { - git ${1:+-c push.default="$1"} push && + git ${1:+-c} ${1:+push.default="$1"} push && check_pushed_commit HEAD "$2" "$3" } @@ -34,7 +34,7 @@ test_push_success () { # check that push fails and does not modify any remote branch test_push_failure () { git --git-dir=repo1 log --no-walk --format='%h %s' --all >expect && - test_must_fail git ${1:+-c push.default="$1"} push && + test_must_fail git ${1:+-c} ${1:+push.default="$1"} push && git --git-dir=repo1 log --no-walk --format='%h %s' --all >actual && test_cmp expect actual } |