mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff --stat: do not do its own three-dashes.

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2006-04-15 14:02:10 -07:00
parent 5069b1cf61
commit 6f4780f9df
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -245,8 +245,6 @@ static void show_stats(struct diffstat_t* data)
if (data->nr == 0) if (data->nr == 0)
return; return;
printf("---\n");
for (i = 0; i < data->nr; i++) { for (i = 0; i < data->nr; i++) {
struct diffstat_file *file = data->files[i]; struct diffstat_file *file = data->files[i];

4
git.c
View File

@ -388,8 +388,10 @@ static int cmd_log(int argc, const char **argv, char **envp)
pretty_print_commit(commit_format, commit, ~0, buf, pretty_print_commit(commit_format, commit, ~0, buf,
LOGSIZE, abbrev); LOGSIZE, abbrev);
printf("%s\n", buf); printf("%s\n", buf);
if (do_diff) if (do_diff) {
printf("---\n");
log_tree_commit(&opt, commit); log_tree_commit(&opt, commit);
}
shown = 1; shown = 1;
free(commit->buffer); free(commit->buffer);
commit->buffer = NULL; commit->buffer = NULL;