X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-log.c;h=db1912a05be425d1f4430aafee5f2bca844dd104;hb=6f9012b62517ca490e4131f24e03ff842527f1b9;hp=71f4ff9b8f7054445dbc27733be41ad114f5e823;hpb=fa0f02dfa15d0d95f8b6d27688bbf8ac940e3354;p=git.git

diff --git a/builtin-log.c b/builtin-log.c
index 71f4ff9b..db1912a0 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -201,9 +201,9 @@ 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)
+	if (numbered && keep_subject)
 		die ("-n and -k are mutually exclusive.");
 
 	argc = setup_revisions(argc, argv, &rev, "HEAD");
@@ -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",