From 6f4780f9dfd3bc6b23f9ea66b3d49577e0a0c2f9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 15 Apr 2006 14:02:10 -0700 Subject: [PATCH] diff --stat: do not do its own three-dashes. 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 --- diff.c | 2 -- git.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index f1b672d2d..cda8d2069 100644 --- a/diff.c +++ b/diff.c @@ -245,8 +245,6 @@ static void show_stats(struct diffstat_t* data) if (data->nr == 0) return; - printf("---\n"); - for (i = 0; i < data->nr; i++) { struct diffstat_file *file = data->files[i]; diff --git a/git.c b/git.c index 78ed403ed..61265a856 100644 --- a/git.c +++ b/git.c @@ -388,8 +388,10 @@ static int cmd_log(int argc, const char **argv, char **envp) 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; -- 2.26.2