git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 18/19] pull --rebase: error on no merge candidate cases

From
Stefan Beller <sbeller@google.com>
Date
Jun 3, 2015, 17:38 UTC
Message-ID
<CAGZ79kZN=1fzjSv-dSgq38CtEKTDxLMoPY8ToNfiEA8QDh3Xpg@mail.gmail.com>
In-Reply-To
<1433314143-4478-19-git-send-email-pyokagan@gmail.com>
On Tue, Jun 2, 2015 at 11:49 PM, Paul Tan <pyokagan@gmail.com> wrote:
Show 41 quoted lines
> 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>
> ---
>
> 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.

Show 18 quoted lines
>                 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
>
Previous: Paul TanNext: Paul Tan
Message 46 of 48 in “Make git-pull a builtin”
  1. 00/19 Make git-pull a builtinPaul Tan, Jun 3, 2015
  2. 01/19 parse-options-cb: implement parse_opt_pass_strbuf()Paul Tan, Jun 3, 2015
  3. Junio C HamanoJun 9, 2015
  4. 02/19 parse-options-cb: implement parse_opt_pass_argv_array()Paul Tan, Jun 3, 2015
  5. Stefan BellerJun 3, 2015
  6. Junio C HamanoJun 9, 2015
  7. Paul TanJun 10, 2015
  8. Junio C HamanoJun 10, 2015
  9. 03/19 argv-array: implement argv_array_pushv()Paul Tan, Jun 3, 2015
  10. 04/19 pull: implement skeletal builtin pullPaul Tan, Jun 3, 2015
  11. Junio C HamanoJun 10, 2015
  12. 05/19 pull: implement fetch + mergePaul Tan, Jun 3, 2015
  13. Junio C HamanoJun 9, 2015
  14. 06/19 pull: pass verbosity, --progress flags to fetch and mergePaul Tan, Jun 3, 2015
  15. Junio C HamanoJun 9, 2015
  16. 07/19 pull: pass git-merge's options to git-mergePaul Tan, Jun 3, 2015
  17. 08/19 pull: pass git-fetch's options to git-fetchPaul Tan, Jun 3, 2015
  18. Stefan BellerJun 3, 2015
  19. 09/19 pull: error on no merge candidatesPaul Tan, Jun 3, 2015
  20. Junio C HamanoJun 9, 2015
  21. Paul TanJun 13, 2015
  22. 10/19 pull: support pull.ff configPaul Tan, Jun 3, 2015
  23. Junio C HamanoJun 9, 2015
  24. 11/19 pull: check if in unresolved merge statePaul Tan, Jun 3, 2015
  25. Junio C HamanoJun 10, 2015
  26. Junio C HamanoJun 10, 2015
  27. Paul TanJun 10, 2015
  28. Junio C HamanoJun 10, 2015
  29. Paul TanJun 14, 2015
  30. 12/19 pull: fast-forward working tree if head is updatedPaul Tan, Jun 3, 2015
  31. 13/19 pull: implement pulling into an unborn branchPaul Tan, Jun 3, 2015
  32. Junio C HamanoJun 10, 2015
  33. 14/19 pull: set reflog messagePaul Tan, Jun 3, 2015
  34. 15/19 pull: teach git pull about --rebasePaul Tan, Jun 3, 2015
  35. Junio C HamanoJun 10, 2015
  36. Paul TanJun 10, 2015
  37. Junio C HamanoJun 10, 2015
  38. Paul TanJun 10, 2015
  39. Junio C HamanoJun 10, 2015
  40. Junio C HamanoJun 10, 2015
  41. 16/19 pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan, Jun 3, 2015
  42. 17/19 pull --rebase: exit early when the working directory is dirtyPaul Tan, Jun 3, 2015
  43. Kevin DaudtJun 3, 2015
  44. Kevin DaudtJun 10, 2015
  45. 18/19 pull --rebase: error on no merge candidate casesPaul Tan, Jun 3, 2015
  46. Stefan BellerJun 3, 2015
  47. 19/19 pull: remove redirection to git-pull.shPaul Tan, Jun 3, 2015
  48. Stefan BellerJun 3, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.