Skip to content

Commit 1400458

Browse files
committed
Merge branch 'jc/push-delete-nothing'
"git push $there --delete ''" should have been diagnosed as an error, but instead turned into a matching push, which has been corrected. * jc/push-delete-nothing: push: do not turn --delete '' into a matching push
2 parents cadae71 + 20e4164 commit 1400458

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

builtin/push.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static void set_refspecs(const char **refs, int nr, const char *repo)
115115
else
116116
refspec_appendf(&rs, "refs/tags/%s", ref);
117117
} else if (deleterefs) {
118-
if (strchr(ref, ':'))
118+
if (strchr(ref, ':') || !*ref)
119119
die(_("--delete only accepts plain target ref names"));
120120
refspec_appendf(&rs, ":%s", ref);
121121
} else if (!strchr(ref, ':')) {

t/t5516-fetch-push.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,11 @@ test_expect_success 'push --delete refuses src:dest refspecs' '
820820
test_must_fail git push testrepo --delete main:foo
821821
'
822822

823+
test_expect_success 'push --delete refuses empty string' '
824+
mk_test testrepo heads/master &&
825+
test_must_fail git push testrepo --delete ""
826+
'
827+
823828
test_expect_success 'warn on push to HEAD of non-bare repository' '
824829
mk_test testrepo heads/main &&
825830
(

0 commit comments

Comments
 (0)