From: Elijah Newren <newren@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: Leif Middelschulte <leif.middelschulte@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/2] merge-recursive: i18n submodule merge output and respect verbosity
Date: Mon, 14 May 2018 18:25:33 -0700 [thread overview]
Message-ID: <CABPp-BFw0g=3i8AoiCDgZR82ScOmiozDQqTggZ4U5kmiurFMdg@mail.gmail.com> (raw)
In-Reply-To: <20180510211917.138518-3-sbeller@google.com>
I know I said the patches looked okay earlier, but I just noticed something...
On Thu, May 10, 2018 at 2:19 PM, Stefan Beller <sbeller@google.com> wrote:
> case 1:
> - MERGE_WARNING(path, "not fast-forward");
> - fprintf(stderr, "Found a possible merge resolution "
> - "for the submodule:\n");
> + output(o, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
We allow folks to set GIT_MERGE_VERBOSITY to change how much output
they get. A setting of 1 should only show conflicts or major
warnings. 2 is the default and adds a few more messages (e.g.
"Auto-merging $PATH", "Adding $PATH" for one-sided adds, etc.), higher
levels show even more.
Anyway this output message is correct to use level 1 since this is a
conflict, but...
> + output(o, 1, _("Found a possible merge resolution for the submodule:\n"));
I think this should use level 2.
> print_commit((struct commit *) merges.objects[0].item);
> - fprintf(stderr,
> + output(o, 1, _(
> "If this is correct simply add it to the index "
> "for example\n"
> "by using:\n\n"
> " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
>- "which will accept this suggestion.\n",
>+ "which will accept this suggestion.\n"),
> oid_to_hex(&merges.objects[0].item->oid), path);
and so should this one (in fact, I'm tempted to say these last two
should use level 3, but since it looks like a command users may have
difficulty finding on their own, I'm okay with going with 2).
next prev parent reply other threads:[~2018-05-15 1:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-10 18:26 [PATCH 0/1] warn about auto fast-forwarded submodules during merges Leif Middelschulte
2018-05-10 18:26 ` [PATCH 1/1] Warn about fast-forwarding of submodules during merge Leif Middelschulte
2018-05-10 18:49 ` Stefan Beller
2018-05-10 20:30 ` Leif Middelschulte
2018-05-10 21:19 ` [PATCH 0/2] Submodule merging: i18n, verbosity Stefan Beller
2018-05-10 21:19 ` [PATCH 1/2] submodule.c: move submodule merging to merge-recursive.c Stefan Beller
2018-05-10 21:19 ` [PATCH 2/2] merge-recursive: i18n submodule merge output and respect verbosity Stefan Beller
2018-05-15 1:25 ` Elijah Newren [this message]
2018-05-11 0:04 ` [PATCH 0/2] Submodule merging: i18n, verbosity Elijah Newren
2018-05-11 1:00 ` Stefan Beller
2018-05-14 20:57 ` [PATCH 0/1] rebased: inform about auto submodule ff during merge Leif Middelschulte
2018-05-14 20:57 ` [PATCH 1/1] Inform about fast-forwarding of submodules " Leif Middelschulte
2018-05-15 0:41 ` Stefan Beller
2018-05-15 1:17 ` Elijah Newren
2018-05-15 7:34 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BFw0g=3i8AoiCDgZR82ScOmiozDQqTggZ4U5kmiurFMdg@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=leif.middelschulte@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).