From: Junio C Hamano Date: Fri, 24 Aug 2012 23:38:53 GMT Subject: Re: [PATCH/RFC] git svn: optionally trim imported log messages Message-ID: <7vk3wnyi5u.fsf@alter.siamese.dyndns.org> In-Reply-To: <5038027B.4090208@debian.org> Robert Luberda writes: >> I think it would be saner to call them "trailers" to avoid >> confusion. > > Thanks, I haven't got any idea how to call them, especially because > existing git documentation refers to them just by using the word `line', > e.g.: > > git-am.txt: Add a `Signed-off-by:` line to the commit message, > git-cherry-pick.txt: Add Signed-off-by line at the end of the Then "line" is fine; they never come before the body, and are certainly not headers. >> There needs an explanation to the reader why this is an optional >> feature. > > OK, I'll add some explanation. Basically it is optional, per Eric > request, for backward compatibility to make it possible to work on a > centralized clone of svn repository by people using both old and new > versions of git svn. That matches my recollection. I didn't ask you to explain it to me, by the way, as I've skimmed the discussion during the review. I wanted the resulting history and the documentation to explain that to git-svn users. > NL means newline. The new line characters implicitly added after each > commit message line, that's why the value is empty. But, yes, this can > be misleading. I'd prefer to keep it short, so would EL (i.e. > `empty-line') be an acceptable name? I'd rather call it "$EMPTY"; $NL is already obscure, nobody uses $EL. >> next_N () { >> N=$(($N + 1)) && >> ... >> } >> >> (the above also has two style fixes). > > Just to be sure: shall the `...' line start a new level of indentation > or is it a typo? It was meant to align with "N=", but perhaps HT and quoting interacted badly or something.