summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-26 18:30:49 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-26 18:30:49 (GMT)
commitadd5c8a562fc0e80ad4eb3d1e2a9f9f47df053a6 (patch)
tree78b076579b388da557ff8f45a869f3c6f525735d /builtin-log.c
parent88a1531435b4cb565d290ed5146352beda52206c (diff)
downloadgit-add5c8a562fc0e80ad4eb3d1e2a9f9f47df053a6.zip
git-add5c8a562fc0e80ad4eb3d1e2a9f9f47df053a6.tar.gz
git-add5c8a562fc0e80ad4eb3d1e2a9f9f47df053a6.tar.bz2
built-in format-patch: various fixups.
- The --start-number handling introduced breakage in the normal code path. It started numbering at 0 when not --numbered, for example. - When generating one file per patch, we needlessly added an extra blank line in front for second and subsequent files. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 71f4ff9..cdcf49e 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -201,7 +201,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
}
argc = j;
- if (numbered && start_number < 0)
+ if (start_number < 0)
start_number = 1;
if (numbered && keep_subject < 0)
die ("-n and -k are mutually exclusive.");
@@ -233,12 +233,21 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
while (0 <= --nr) {
int shown;
commit = list[nr];
- rev.nr = rev.total - nr;
+ rev.nr = total - nr + (start_number - 1);
if (!use_stdout)
reopen_stdout(commit, rev.nr, keep_subject);
shown = log_tree_commit(&rev, commit);
free(commit->buffer);
commit->buffer = NULL;
+
+ /* We put one extra blank line between formatted
+ * patches and this flag is used by log-tree code
+ * to see if it needs to emit a LF before showing
+ * the log; when using one file per patch, we do
+ * not want the extra blank line.
+ */
+ if (!use_stdout)
+ rev.shown_one = 0;
if (shown) {
if (rev.mime_boundary)
printf("\n--%s%s--\n\n\n",