From: Stefan Beller <sbeller@google.com>
To: leif.middelschulte@gmail.com
Cc: git@vger.kernel.org, gitster@pobox.com,
sandals@crustytoothpaste.ath.cx, sbeller@google.com
Subject: [PATCH 0/2] Submodule merging: i18n, verbosity
Date: Thu, 10 May 2018 14:19:15 -0700
Message-ID: <20180510211917.138518-1-sbeller@google.com> (raw)
In-Reply-To: <CANw0+A_T5zDUUWznYBe0m9fkSODPnfQaK1yJKPPawHTxi9+9BQ@mail.gmail.com>
Leif wrote:
> Sure, let me know what to use instead and I’ll update and resubmit the patch.
> Sure, but `MERGE_WARNING` prefixes all the messages with "Failed to
> merge submodule“.
I thought about replying and coming up with good reasons, but I wrote some
patches instead.
They can also be found at https://github.com/stefanbeller/git/tree/submodule_i18n_verbose
I think these would be a good foundation for your patch as well, as you can use the
output() function for the desired cases.
Feel free to take these patches as part of your series or adapt
(or be inspired by) as needed.
Thanks,
Stefan
Stefan Beller (2):
submodule.c: move submodule merging to merge-recursive.c
merge-recursive: i18n submodule merge output and respect verbosity
merge-recursive.c | 169 +++++++++++++++++++++++++++++++++++++++++++++-
submodule.c | 168 +--------------------------------------------
submodule.h | 6 +-
3 files changed, 170 insertions(+), 173 deletions(-)
--
2.17.0.255.g8bfb7c0704