summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-23 23:13:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-02-23 23:19:34 (GMT)
commit20e416409fc2bc260faf65a0fc74927ed0d3ca12 (patch)
treea8012d82b6ea04b43bfb95c04439a7aa01e386bf /builtin
parent898f80736c75878acc02dc55672317fcc0e0a5a6 (diff)
downloadgit-20e416409fc2bc260faf65a0fc74927ed0d3ca12.zip
git-20e416409fc2bc260faf65a0fc74927ed0d3ca12.tar.gz
git-20e416409fc2bc260faf65a0fc74927ed0d3ca12.tar.bz2
push: do not turn --delete '' into a matching push
When we added a syntax sugar "git push remote --delete <ref>" to "git push" as a synonym to the canonical "git push remote :<ref>" syntax at f517f1f2 (builtin-push: add --delete as syntactic sugar for :foo, 2009-12-30), we weren't careful enough to make sure that <ref> is not empty. Blindly rewriting "--delete <ref>" to ":<ref>" means that an empty string <ref> results in refspec ":", which is the syntax to ask for "matching" push that does not delete anything. Worse yet, if there were matching refs that can be fast-forwarded, they would have been published prematurely, even if the user feels that they are not ready yet to be pushed out, which would be a real disaster. Noticed-by: Tilman Vogel <tilman.vogel@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 6da3a8e..da34524 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -115,7 +115,7 @@ static void set_refspecs(const char **refs, int nr, const char *repo)
else
refspec_appendf(&rs, "refs/tags/%s", ref);
} else if (deleterefs) {
- if (strchr(ref, ':'))
+ if (strchr(ref, ':') || !*ref)
die(_("--delete only accepts plain target ref names"));
refspec_appendf(&rs, ":%s", ref);
} else if (!strchr(ref, ':')) {