Skip to content

Commit

Permalink
format-patch: --numbered-files and --stdout aren't mutually exclusive
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Boyd authored and Junio C Hamano committed Mar 22, 2009
1 parent 821d56a commit b60df87
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion Documentation/git-format-patch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ include::diff-options.txt[]
--numbered-files::
Output file names will be a simple number sequence
without the default first line of the commit appended.
Mutually exclusive with the --stdout option.

-k::
--keep-subject::
Expand Down
2 changes: 0 additions & 2 deletions builtin-log.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b60df87

Please sign in to comment.