summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-03-21 21:32:43 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-21 22:45:28 -0700
commitb60df87a6b39b3e9fc2fe81585a8bc55a502dcd3 (patch)
tree27365151b9bd842b851524f7d3f7698a74c89f26 /builtin-log.c
parent821d56aa68c38f7390b3171092f7b8b814357194 (diff)
downloadgit-b60df87a6b39b3e9fc2fe81585a8bc55a502dcd3.tar.gz
format-patch: --numbered-files and --stdout aren't mutually exclusive
For example: git format-patch --numbered-files --stdout --attach HEAD~~ will create two messages with files 1 and 2 attached respectively. Without --attach/--inline but with --stdout, --numbered-files option can be simply ignored, because we are not creating any file ourselves. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 2ae39afccd..0f0adf2bab 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -917,8 +917,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
die ("-n and -k are mutually exclusive.");
if (keep_subject && subject_prefix)
die ("--subject-prefix and -k are mutually exclusive.");
- if (numbered_files && use_stdout)
- die ("--numbered-files and --stdout are mutually exclusive.");
argc = setup_revisions(argc, argv, &rev, "HEAD");
if (argc > 1)