H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-03-16 13:35:20 +00:00
Code Releases Activity

Clean up git-diff-tree 'header' generation

Browse Source
This commit is contained in:
Linus Torvalds 2005-06-23 13:56:55 -07:00
parent aefa4a5b1c
commit 180926636e
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
diff-tree.c
View File

@ -280,11 +280,7 @@ static int call_diff_flush(void)
return 0; return 0;
} }
if (header) { if (header) {
const char *fmt = "%s"; printf("%s%c", header, diff_output_format == DIFF_FORMAT_MACHINE ? 0 : '\n');
if (diff_output_format == DIFF_FORMAT_MACHINE)
fmt = "%s%c";
printf(fmt, header, 0);
header = NULL; header = NULL;
} }
diff_flush(diff_output_format); diff_flush(diff_output_format);
@ -318,18 +314,16 @@ static int diff_root_tree(const unsigned char *new, const char *base)
return retval; return retval;
} }
static char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len) static const char *generate_header(const char *commit, const char *parent, const char *msg, unsigned long len)
{ {
static char this_header[16384]; static char this_header[16384];
int offset; int offset;
offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent); if (!verbose_header)
if (verbose_header) { return commit;
offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
this_header[offset++] = '\n';
this_header[offset++] = 0;
}
offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
return this_header; return this_header;
} }