Fix "git log -z" behaviour

For commit messages, we should really put the "line_termination" when we
output the character in between different commits, *not* between the
commit and the diff. The diff goes hand-in-hand with the commit, it
shouldn't be separated from it with the termination character.

So this:
 - uses the termination character for true inter-commit spacing
 - uses a regular newline between the commit log and the diff

We had it the other way around.

For the normal case where the termination character is '\n', this
obviously doesn't change anything at all, since we just switched two
identical characters around. So it's very safe - it doesn't change any
normal usage, but it definitely fixes "git log -z".

By fixing "git log -z", you can now also do insane things like

	git log -p -z |
		grep -z "some patch expression" |
		tr '\0' '\n' |
		less -S

and you will see only those commits that have the "some patch expression"
in their commit message _or_ their patches.

(This is slightly different from 'git log -S"some patch expression"',
since the latter requires the expression to literally *change* in the
patch, while the "git log -p -z | grep .." approach will see it if it's
just an unchanged _part_ of the patch context)

Of course, if you actually do something like the above, you're probably
insane, but hey, it works!

Try the above command line for a demonstration (of course, you need to
change the "some patch expression" to be something relevant). The old
behaviour of "git log -p -z" was useless (and got things completely wrong
for log entries without patches).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/log-tree.c b/log-tree.c
index d8ca36bbdd92f77e7d955c86bb11823a21501fa6..85acd66df7506b383db545f61eb330e401239b4e 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -143,7 +143,7 @@ void show_log(struct rev_info *opt, const char *sep)
        if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
                extra = "\n";
        if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
-               putchar('\n');
+               putchar(opt->diffopt.line_termination);
        opt->shown_one = 1;
 
        /*
@@ -270,9 +270,8 @@ int log_tree_diff_flush(struct rev_info *opt)
                    opt->commit_format != CMIT_FMT_ONELINE) {
                        int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
                        if ((pch & opt->diffopt.output_format) == pch)
-                               printf("---%c", opt->diffopt.line_termination);
-                       else
-                               putchar(opt->diffopt.line_termination);
+                               printf("---");
+                       putchar('\n');
                }
        }
        diff_flush(&opt->diffopt);