diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-06-24 14:46:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-24 09:14:21 -0700 |
| commit | 4d04658d8b5c72d2ebbb3aec7b06228e2ae1d327 (patch) | |
| tree | 7f13e96cf5577016cd419927e7079a082460cd4a | |
| parent | 489947cee5095b168cbac111ff7bd1eadbbd90dd (diff) | |
| download | git-4d04658d8b5c72d2ebbb3aec7b06228e2ae1d327.tar.gz | |
send-pack/transport-helper: avoid mentioning a particular branch
When trying to push all matching branches, but none match, we offer a
message suggesting to push the `master` branch.
However, we want to step away from making that branch any more special
than any other branch, so let's reword that message to mention no branch
in particular.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | send-pack.c | 2 | ||||
| -rwxr-xr-x | t/t5528-push-default.sh | 6 | ||||
| -rw-r--r-- | transport-helper.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/send-pack.c b/send-pack.c index 0abee22283..19eb9b04e4 100644 --- a/send-pack.c +++ b/send-pack.c @@ -406,7 +406,7 @@ int send_pack(struct send_pack_args *args, if (!remote_refs) { fprintf(stderr, "No refs in common and none specified; doing nothing.\n" - "Perhaps you should specify a branch such as 'master'.\n"); + "Perhaps you should specify a branch.\n"); return 0; } if (args->atomic && !atomic_supported) diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh index 4d1e0c363e..f0a287d97d 100755 --- a/t/t5528-push-default.sh +++ b/t/t5528-push-default.sh @@ -98,6 +98,12 @@ test_expect_success 'push from/to new branch with upstream, matching and simple' test_push_failure upstream ' +test_expect_success '"matching" fails if none match' ' + git init --bare empty && + test_must_fail git push empty : 2>actual && + test_i18ngrep "Perhaps you should specify a branch" actual +' + test_expect_success 'push ambiguously named branch with upstream, matching and simple' ' git checkout -b ambiguous && test_config branch.ambiguous.remote parent1 && diff --git a/transport-helper.c b/transport-helper.c index a46afcb69d..8a711cda29 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1046,7 +1046,7 @@ static int push_refs(struct transport *transport, if (!remote_refs) { fprintf(stderr, _("No refs in common and none specified; doing nothing.\n" - "Perhaps you should specify a branch such as 'master'.\n")); + "Perhaps you should specify a branch.\n")); return 0; } |