summaryrefslogtreecommitdiff
path: root/t/t5543-atomic-push.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-05-15 13:59:05 -0700
committerJunio C Hamano <gitster@pobox.com>2023-05-15 13:59:05 -0700
commitf37da977232ff490343d480dfbcd6afcc4d5523e (patch)
treed04de190c5e67ec904679755a28b1de1368f782e /t/t5543-atomic-push.sh
parentbe2fd0edb16951959d6e045dce9232650cfeada0 (diff)
parent022fbb655d371db6382415bcfba5cdf741afeb41 (diff)
downloadgit-f37da977232ff490343d480dfbcd6afcc4d5523e.tar.gz
Merge branch 'tl/push-branches-is-an-alias-for-all'
"git push --all" gained an alias "git push --branches". * tl/push-branches-is-an-alias-for-all: t5583: fix shebang line push: introduce '--branches' option
Diffstat (limited to 't/t5543-atomic-push.sh')
-rwxr-xr-xt/t5543-atomic-push.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t5543-atomic-push.sh b/t/t5543-atomic-push.sh
index 70431122a4..04b47ad84a 100755
--- a/t/t5543-atomic-push.sh
+++ b/t/t5543-atomic-push.sh
@@ -117,7 +117,10 @@ test_expect_success 'atomic push fails if one branch fails' '
test_commit five &&
git checkout main &&
test_commit six &&
- test_must_fail git push --atomic --all up
+ test_must_fail git push --atomic --all up >output-all 2>&1 &&
+ # --all and --branches have the same behavior when be combined with --atomic
+ test_must_fail git push --atomic --branches up >output-branches 2>&1 &&
+ test_cmp output-all output-branches
) &&
test_refs main HEAD@{7} &&
test_refs second HEAD@{4}