summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5069b1c)
raw | patch | inline | side by side (parent: 5069b1c)
author | Junio C Hamano <junkio@cox.net> | |
Sat, 15 Apr 2006 21:02:10 +0000 (14:02 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 15 Apr 2006 21:06:42 +0000 (14:06 -0700) |
I missed that "git-diff-* --stat" spits out three-dash separator
on its own without being asked. Remove it.
When we output commit log followed by diff, perhaps --patch-with-stat,
for downstream consumer, we _would_ want the three-dash between
the message and the diff material, but that logic belongs to the
caller, not diff generator.
Signed-off-by: Junio C Hamano <junkio@cox.net>
on its own without being asked. Remove it.
When we output commit log followed by diff, perhaps --patch-with-stat,
for downstream consumer, we _would_ want the three-dash between
the message and the diff material, but that logic belongs to the
caller, not diff generator.
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff.c | patch | blob | history | |
git.c | patch | blob | history |
index f1b672d2dc29d22a38aa057a1a927b8ad60d5e15..cda8d2069efd4f408b17fe7c32c51ab7ccea65cb 100644 (file)
--- a/diff.c
+++ b/diff.c
if (data->nr == 0)
return;
- printf("---\n");
-
for (i = 0; i < data->nr; i++) {
struct diffstat_file *file = data->files[i];
index 78ed403ed121a84c3efe3a57fa7c24486d724953..61265a85661a3b56c6ad437099ab0c85e9fbe158 100644 (file)
--- a/git.c
+++ b/git.c
pretty_print_commit(commit_format, commit, ~0, buf,
LOGSIZE, abbrev);
printf("%s\n", buf);
- if (do_diff)
+ if (do_diff) {
+ printf("---\n");
log_tree_commit(&opt, commit);
+ }
shown = 1;
free(commit->buffer);
commit->buffer = NULL;