diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2013-06-19 16:41:43 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-06-24 10:18:41 -0700 |
| commit | 396243fa479cd27bef1ced2ea5a9e4cf20f85a4b (patch) | |
| tree | dc3bd4bbe291a5ce7dd4b0df4f296e2562596ac6 | |
| parent | push: change `simple` to accommodate triangular workflows (diff) | |
| download | tgif-396243fa479cd27bef1ced2ea5a9e4cf20f85a4b.tar.xz | |
t/t5528-push-default: generalize test_push_*
The setup creates two bare repositories: repo1 and repo2, but
test_push_commit() hard-codes checking in repo1 for the actual output.
Generalize it and its caller, test_push_success(), to optionally accept
a third argument to specify the name of the repository to check for
actual output. We will use this in the next patch.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5528-push-default.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh index 69ce6bfda8..db58e7ffb3 100755 --- a/t/t5528-push-default.sh +++ b/t/t5528-push-default.sh @@ -15,17 +15,19 @@ test_expect_success 'setup bare remotes' ' # $1 = local revision # $2 = remote revision (tested to be equal to the local one) +# $3 = [optional] repo to check for actual output (repo1 by default) check_pushed_commit () { git log -1 --format='%h %s' "$1" >expect && - git --git-dir=repo1 log -1 --format='%h %s' "$2" >actual && + git --git-dir="${3:-repo1}" log -1 --format='%h %s' "$2" >actual && test_cmp expect actual } # $1 = push.default value # $2 = expected target branch for the push +# $3 = [optional] repo to check for actual output (repo1 by default) test_push_success () { git -c push.default="$1" push && - check_pushed_commit HEAD "$2" + check_pushed_commit HEAD "$2" "$3" } # $1 = push.default value |