On Tue, Jun 2, 2015 at 11:49 PM, Paul Tan <pyoka...@gmail.com> wrote:
> 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 <pyoka...@gmail.com>
> ---
>
> Notes:
> v2
>
> * Decided to use fprintf_ln() for the sake of code consistency, and for
> the added trailing newline.
>
> builtin/pull.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/pull.c b/builtin/pull.c
> index f5d437a..4e1ab5b 100644
> --- a/builtin/pull.c
> +++ b/builtin/pull.c
> @@ -439,7 +439,10 @@ static void NORETURN die_no_merge_candidates(const char
> *repo, const char **refs
> const char *remote = curr_branch ? curr_branch->remote_name : NULL;
>
> if (*refspecs) {
> - fprintf_ln(stderr, _("There are no candidates for merging
> among the refs that you just fetched."));
> + 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, _("Generally this means that you provided
> a wildcard refspec which had no\n"
> "matches on the remote end."));
> } else if (repo && curr_branch && (!remote || strcmp(repo, remote))) {
> @@ -449,7 +452,10 @@ static void NORETURN die_no_merge_candidates(const char
> *repo, const char **refs
> repo);
> } else if (!curr_branch) {
> fprintf_ln(stderr, _("You are not currently on a branch."));
> - fprintf_ln(stderr, _("Please specify which branch you want to
> merge with."));
> + 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."));
Now that you're using fprintf you could make use of its formatting
capabilities, but then it occurred to me
it's translated strings, so it's most likely better to not make it
concise but rather easier for the translators
by having each sentence written out in full.
> fprintf_ln(stderr, _("See git-pull(1) for details."));
> fprintf(stderr, "\n");
> fprintf_ln(stderr, " git pull <remote> <branch>");
> @@ -461,7 +467,10 @@ static void NORETURN die_no_merge_candidates(const char
> *repo, const char **refs
> remote_name = "<remote>";
>
> fprintf_ln(stderr, _("There is no tracking information for
> the current branch."));
> - fprintf_ln(stderr, _("Please specify which branch you want to
> merge with."));
> + 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, _("See git-pull(1) for details."));
> fprintf(stderr, "\n");
> fprintf_ln(stderr, " git pull <remote> <branch>");
> --
> 2.1.4
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
