[PATCH 4/4] format-patch: Add "--no-stat" as a synonym for "-p"
- From
Björn Gustavsson <bgustavsson@gmail.com>
- Date
- Nov 7, 2009, 09:58 UTC
- Message-ID
- <4AF544DF.6070404@gmail.com>
"-p" means "generate patch" in 'git log' and 'git diff', so it's quite surprising that it means "suppress diffstat" in 'git format-patch'.
Keep the "-p" option for backward compatibility, but add "--no-stat" as a more intuitive synonym. For backward compatibility with scripts, we must allow combinations of --stat and --no-stat.
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> --- This patch is new.
Unfortunately, we must allow --no-stat and --stat (or alternatively complicate the implementation to allow -p and --stat, but not --no-stat and --stat). If that seems too strange, perhaps we are better off without this patch.
Documentation/diff-options.txt | 1 + builtin-log.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 9398329..c4d65ba 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -14,6 +14,7 @@ endif::git-format-patch[] ifdef::git-format-patch[] -p:: +--no-stat Generate plain patches without any diffstats. endif::git-format-patch[] diff --git a/builtin-log.c b/builtin-log.c index 9df8dac..968a038 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -925,7 +925,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) "show patch format instead of default (patch + stat)"), OPT_BOOLEAN(0, "ignore-if-in-upstream", &ignore_if_in_upstream, "don't include a patch matching a commit upstream"), - OPT_BOOLEAN('p', NULL, &use_patch_format, + OPT_BOOLEAN('p', "no-stat", &use_patch_format, "show patch format instead of default (patch + stat)"), OPT_GROUP("Messaging"), { OPTION_CALLBACK, 0, "add-header", NULL, "header",
-- 1.6.5.1.69.g36942