From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: Jens Lehmann <Jens.Lehmann@web•de>, Johannes Sixt <j6t@kdbg•org>,
Ari Pollak <ari@debian•org>,
git@vger•kernel.org
Subject: Re: [RFC PATCH] commit -v: strip diffs and submodule shortlogs from the commit message
Date: Mon, 18 Nov 2013 08:01:49 -0800 [thread overview]
Message-ID: <xmqqk3g5d7gy.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20131117090935.GC17016@sigill.intra.peff.net> (Jeff King's message of "Sun, 17 Nov 2013 04:09:36 -0500")
Jeff King <peff@peff•net> writes:
> I found this hard to parse, I think because of the "keeping" (why would
> I not keep it?), and because you are talking about lines above and
> below. It is not as accurate to say:
>
> # ------------------ >8 --------------------
> # Everything below this line will be removed.
>
> because it is technically the line above that is the cutoff. But I think
> the meaning is clear, and it is simpler to parse.
>
> I do think it would be simpler with a single line. I know handling the
> i18n was a question there, but I think we should be fine as long as we
> check for the exact bytes we wrote. Surely gettext can do something
> like:
>
> magic = _("# Everything below this line will be removed");
> fprintf(fh, "%s", magic);
> ...
> p = strstr(magic);
>
> I don't know what guarantees on string lifetime gettext gives us, but
> the worst case is that we simply strdup the result.
>
> I suppose it's possible that the translated string could have utf8 with
> multiple representations, and the user's editor normalizes the text in a
> different way than we wrote it when it saves the result. I don't know if
> that is worth caring about or not; it seems kind of insane.
I agree with your rewording suggestion. It might make it even more
robust to do something like
const char cut_here[] = "# --- cut here --- >8 --- cut here ---";
fprintf(fh, "%s\n", cut_here);
fputs(_("# Everything below this line will be removed\n"), fh);
...
p = strstr(cut_here);
i.e. a real marker line that will never be translated, with an
explanation immediately below that can be translated.
next prev parent reply other threads:[~2013-11-18 16:02 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
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 [this message]
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=xmqqk3g5d7gy.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Jens.Lehmann@web$(echo .)de \
--cc=ari@debian$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=j6t@kdbg$(echo .)org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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