diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:33 -0800 |
| commit | 140045821aa78da3a80a7d7c8f707b955e1ab40d (patch) | |
| tree | 9a8bb3c516eb72c8a5141dd3c162e3dc2d34d186 | |
| parent | Merge branch 'sh/mergetools-vimdiff1' (diff) | |
| parent | push: do not turn --delete '' into a matching push (diff) | |
| download | tgif-140045821aa78da3a80a7d7c8f707b955e1ab40d.tar.xz | |
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
| -rw-r--r-- | builtin/push.c | 2 | ||||
| -rwxr-xr-x | t/t5516-fetch-push.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/builtin/push.c b/builtin/push.c index 03adb58602..194967ed79 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, ':')) { diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 15262b4192..f11742ed59 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -820,6 +820,11 @@ test_expect_success 'push --delete refuses src:dest refspecs' ' test_must_fail git push testrepo --delete main:foo ' +test_expect_success 'push --delete refuses empty string' ' + mk_test testrepo heads/master && + test_must_fail git push testrepo --delete "" +' + test_expect_success 'warn on push to HEAD of non-bare repository' ' mk_test testrepo heads/main && ( |