From: Jens Lehmann <Jens.Lehmann@web.de>
To: Johannes Sixt <j6t@kdbg.org>, Ari Pollak <ari@debian.org>,
git@vger.kernel.org, Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: Bug? diff.submodule=log adds text to commit -v message
Date: Tue, 12 Nov 2013 23:17:46 +0100 [thread overview]
Message-ID: <5282A90A.4030900@web.de> (raw)
In-Reply-To: <5281DCC5.2000209@kdbg.org>
Am 12.11.2013 08:46, schrieb Johannes Sixt:
> Am 11.11.2013 22:29, schrieb Jens Lehmann:
>> The diff below fixes the problem you describe for me. (But I do not
>> consider it a worthwhile fix in its current form because a line
>> starting with "Submodule " might appear in a perfectly normal commit
>> message, while "diff --git " most probably won't).
>
> And on top of that, "Submodule " originates from a translatable string,
> doesn't it?
This would also be true for the marker line that Peff proposed:
# Everything below this line is a diff that will be removed.
But I suspect that would be ok if the marker would be both added
and searched for in its translated form. Or is it possible that
the locale changes between those two steps?
next prev parent reply other threads:[~2013-11-12 22:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-10 21:49 Bug? diff.submodule=log adds text to commit -v message Ari Pollak
2013-11-11 20:41 ` Jens Lehmann
2013-11-11 20:48 ` Ari Pollak
2013-11-11 21:29 ` Jens Lehmann
2013-11-11 21:34 ` Jens Lehmann
2013-11-11 23:24 ` Jeff King
2013-11-12 7:46 ` Johannes Sixt
2013-11-12 22:17 ` Jens Lehmann [this message]
2013-11-12 22:20 ` Junio C Hamano
2013-11-13 18:37 ` Jens Lehmann
2013-11-13 20:04 ` Junio C Hamano
2013-11-16 22:52 ` [RFC PATCH] commit -v: strip diffs and submodule shortlogs from the commit message Jens Lehmann
2013-11-17 0:22 ` Eric Sunshine
2013-11-17 8:53 ` Jeff King
2013-11-17 9:09 ` Jeff King
2013-11-17 12:20 ` Jens Lehmann
2013-11-18 16:01 ` Junio C Hamano
2013-11-19 18:47 ` [PATCH v2 ] " Jens Lehmann
2013-11-19 19:07 ` Junio C Hamano
2013-11-19 19:31 ` Junio C Hamano
2013-11-19 19:42 ` Junio C Hamano
2013-11-19 20:34 ` Junio C Hamano
2013-11-19 21:01 ` Jens Lehmann
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5282A90A.4030900@web.de \
--to=jens.lehmann@web.de \
--cc=ari@debian.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).