mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send-pack/transport-helper: avoid mentioning a particular branch

Browse Source 
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>
This commit is contained in:
Johannes Schindelin
2020-06-24 14:46:29 +00:00
committed by Junio C Hamano
parent 489947cee5
commit 4d04658d8b
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
send-pack.c
View File

@ -406,7 +406,7 @@ int send_pack(struct send_pack_args *args,
if (!remote_refs) { if (!remote_refs) {
fprintf(stderr, "No refs in common and none specified; doing nothing.\n" 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; return 0;
} }
if (args->atomic && !atomic_supported) if (args->atomic && !atomic_supported)

6
t/t5528-push-default.sh
View File

@ -98,6 +98,12 @@ test_expect_success 'push from/to new branch with upstream, matching and simple'
test_push_failure upstream 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' ' test_expect_success 'push ambiguously named branch with upstream, matching and simple' '
git checkout -b ambiguous && git checkout -b ambiguous &&
test_config branch.ambiguous.remote parent1 && test_config branch.ambiguous.remote parent1 &&

2
transport-helper.c
View File

@ -1046,7 +1046,7 @@ static int push_refs(struct transport *transport,
if (!remote_refs) { if (!remote_refs) {
fprintf(stderr, fprintf(stderr,
_("No refs in common and none specified; doing nothing.\n" _("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; return 0;
} }