From: Junio C Hamano <junkio@cox.net>
Date: Sun, 28 May 2006 16:23:29 +0000 (-0700)
Subject: format-patch: -n and -k are mutually exclusive.
X-Git-Tag: v1.4.0-rc1~59
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=63b398a428c5294819a70d9c56879e7fac62a523;p=git.git

format-patch: -n and -k are mutually exclusive.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-log.c b/builtin-log.c
index cdcf49e21..db1912a05 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -203,7 +203,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
 
 	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");