Browse Source

pull --rebase: error on no merge candidate cases

Tweak the error messages printed by die_no_merge_candidates() to take
into account that we may be "rebasing against" rather than "merging
with".

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Paul Tan 10 years ago committed by Junio C Hamano
parent
commit
b7b314711a
  1. 9
      builtin/pull.c

9
builtin/pull.c

@ -431,6 +431,9 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
const char *remote = curr_branch ? curr_branch->remote_name : NULL; const char *remote = curr_branch ? curr_branch->remote_name : NULL;


if (*refspecs) { if (*refspecs) {
if (opt_rebase)
fprintf_ln(stderr, _("There is no candidate for rebasing against among the refs that you just fetched."));
else
fprintf_ln(stderr, _("There are no candidates for merging among the refs that you just fetched.")); fprintf_ln(stderr, _("There are no candidates for merging among the refs that you just fetched."));
fprintf_ln(stderr, _("Generally this means that you provided a wildcard refspec which had no\n" fprintf_ln(stderr, _("Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end.")); "matches on the remote end."));
@ -441,6 +444,9 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
repo); repo);
} else if (!curr_branch) { } else if (!curr_branch) {
fprintf_ln(stderr, _("You are not currently on a branch.")); fprintf_ln(stderr, _("You are not currently on a branch."));
if (opt_rebase)
fprintf_ln(stderr, _("Please specify which branch you want to rebase against."));
else
fprintf_ln(stderr, _("Please specify which branch you want to merge with.")); fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
fprintf_ln(stderr, _("See git-pull(1) for details.")); fprintf_ln(stderr, _("See git-pull(1) for details."));
fprintf(stderr, "\n"); fprintf(stderr, "\n");
@ -453,6 +459,9 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
remote_name = "<remote>"; remote_name = "<remote>";


fprintf_ln(stderr, _("There is no tracking information for the current branch.")); fprintf_ln(stderr, _("There is no tracking information for the current branch."));
if (opt_rebase)
fprintf_ln(stderr, _("Please specify which branch you want to rebase against."));
else
fprintf_ln(stderr, _("Please specify which branch you want to merge with.")); fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
fprintf_ln(stderr, _("See git-pull(1) for details.")); fprintf_ln(stderr, _("See git-pull(1) for details."));
fprintf(stderr, "\n"); fprintf(stderr, "\n");

Loading…
Cancel
Save