summaryrefslogtreecommitdiff
path: root/t/t5533-push-cas.sh
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2016-07-26 20:44:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-26 20:48:09 (GMT)
commiteee98e74f928a49c310038c77026ebc04e6cf4b2 (patch)
treeefb8d9d0f487770a486f9a2ff9cb82fd60772e77 /t/t5533-push-cas.sh
parentd132b32b4e3146e4aa5a719418f85d6db1134140 (diff)
downloadgit-eee98e74f928a49c310038c77026ebc04e6cf4b2.zip
git-eee98e74f928a49c310038c77026ebc04e6cf4b2.tar.gz
git-eee98e74f928a49c310038c77026ebc04e6cf4b2.tar.bz2
push: add shorthand for --force-with-lease branch creation
Allow the empty string to stand in for the null SHA-1 when pushing a new branch, like we do when deleting branches. This means that the following command ensures that `new-branch` is created on the remote (that is, is must not already exist): git push --force-with-lease=new-branch: origin new-branch Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5533-push-cas.sh')
-rwxr-xr-xt/t5533-push-cas.sh26
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
index c732012..ed631c3 100755
--- a/t/t5533-push-cas.sh
+++ b/t/t5533-push-cas.sh
@@ -191,4 +191,30 @@ test_expect_success 'cover everything with default force-with-lease (allowed)' '
test_cmp expect actual
'
+test_expect_success 'new branch covered by force-with-lease (explicit)' '
+ setup_srcdst_basic &&
+ (
+ cd dst &&
+ git branch branch master &&
+ git push --force-with-lease=branch: origin branch
+ ) &&
+ git ls-remote dst refs/heads/branch >expect &&
+ git ls-remote src refs/heads/branch >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'new branch already exists' '
+ setup_srcdst_basic &&
+ (
+ cd src &&
+ git checkout -b branch master &&
+ test_commit c
+ ) &&
+ (
+ cd dst &&
+ git branch branch master &&
+ test_must_fail git push --force-with-lease=branch: origin branch
+ )
+'
+
test_done