Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-13 Thread Jens Lehmann
Am 12.11.2013 23:20, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: 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

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-13 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: If we were introducing a divider line for machine consumption, I do not think it is wise to let that line even translated... Ok, but then it won't mean much to readers who don't understand English. I assume prefixing all diff lines with # is out of

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-12 Thread Jens Lehmann
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

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-12 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: 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

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Jens Lehmann
Hi Ari, Am 10.11.2013 22:49, schrieb Ari Pollak: I'm using git 1.8.4.2, and I've set the diff.submodule = log option globally. If I change the revision that a submodule is set to, then run git commit -av, The submodule shortlog is appended to the log message without any #s before it, so

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Ari Pollak
Jens Lehmann writes: And after adding a modified file the log message also shows the diff of that file (and without leading # s too), so I doubt that diffs aren't normally included in the commit message with -v. What am I missing? Ah, it is true that -v normally does not prefix the diffs with

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Jens Lehmann
Am 11.11.2013 21:48, schrieb Ari Pollak: Jens Lehmann writes: And after adding a modified file the log message also shows the diff of that file (and without leading # s too), so I doubt that diffs aren't normally included in the commit message with -v. What am I missing? Ah, it is true that

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Jens Lehmann
Am 11.11.2013 22:29, schrieb Jens Lehmann: And while testing this issue I noticed another problem: When using git commit -a not only the staged commits of a submodule get committed, but also the unstaged commits. Will look into that too. Ok, scrap that. This is exactly what is expected. -- To

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread Jeff King
On Mon, Nov 11, 2013 at 10:29:25PM +0100, Jens Lehmann wrote: 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

Re: Bug? diff.submodule=log adds text to commit -v message

2013-11-11 Thread 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).