diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 13:56:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 13:56:55 -0700 |
| commit | 180926636e47ecfe28d03cec493af75899994f0f (patch) | |
| tree | b3d500c065cdd0fd6fd4e823071838a6b6805193 | |
| parent | aefa4a5b1cb6cafab14b8179dc803881d1da45bf (diff) | |
| download | git-180926636e47ecfe28d03cec493af75899994f0f.tar.gz git-180926636e47ecfe28d03cec493af75899994f0f.tar.xz | |
Clean up git-diff-tree 'header' generation
| -rw-r--r-- | diff-tree.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/diff-tree.c b/diff-tree.c index 7446e09af..d467e6cf8 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -280,11 +280,7 @@ static int call_diff_flush(void) return 0; } if (header) { - const char *fmt = "%s"; - if (diff_output_format == DIFF_FORMAT_MACHINE) - fmt = "%s%c"; - - printf(fmt, header, 0); + printf("%s%c", header, diff_output_format == DIFF_FORMAT_MACHINE ? 0 : '\n'); header = NULL; } diff_flush(diff_output_format); @@ -318,18 +314,16 @@ static int diff_root_tree(const unsigned char *new, const char *base) 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]; int offset; - offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent); - if (verbose_header) { - offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset); - this_header[offset++] = '\n'; - this_header[offset++] = 0; - } + if (!verbose_header) + return commit; + 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; } |