[PATCH v4 13/45] revert/cherry-pick: add --quiet option
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:38
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Felipe Contreras <redacted> --- Documentation/git-cherry-pick.txt | 6 +++++- Documentation/git-revert.txt | 6 +++++- builtin/revert.c | 1 + builtin/sequencer.c | 3 +++ builtin/sequencer.h | 1 + 5 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index fccd936..da0bd81 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt@@ -8,7 +8,7 @@ git-cherry-pick - Apply the changes introduced by some existing commits SYNOPSIS -------- [verse] -'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>... +'git cherry-pick' [-q] [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>... 'git cherry-pick' --continue 'git cherry-pick' --quit 'git cherry-pick' --abort
@@ -51,6 +51,10 @@ OPTIONS feed all <commit>... arguments to a single revision walk (see a later example that uses 'maint master..next'). +-q:: +--quiet:: + Quiet, suppress feedback messages. + -e:: --edit:: With this option, 'git cherry-pick' will let you edit the commit
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index f79c9d8..98a8e7a 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt@@ -8,7 +8,7 @@ git-revert - Revert some existing commits SYNOPSIS -------- [verse] -'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] <commit>... +'git revert' [-q] [--[no-]edit] [-n] [-m parent-number] [-s] <commit>... 'git revert' --continue 'git revert' --quit 'git revert' --abort
@@ -40,6 +40,10 @@ OPTIONS default, see linkgit:git-rev-list[1] and its '--no-walk' option. +-q:: +--quiet:: + Quiet, suppress feedback messages. + -e:: --edit:: With this option, 'git revert' will let you edit the commit
diff --git a/builtin/revert.c b/builtin/revert.c
index 5a8453d..ec83748 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c@@ -100,6 +100,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) int contin = 0; int rollback = 0; struct option options[] = { + OPT__QUIET(&opts->quiet, N_("suppress progress reporting")), OPT_BOOLEAN(0, "quit", &remove_state, N_("end revert or cherry-pick sequence")), OPT_BOOLEAN(0, "continue", &contin, N_("resume revert or cherry-pick sequence")), OPT_BOOLEAN(0, "abort", &rollback, N_("cancel revert or cherry-pick sequence")),
diff --git a/builtin/sequencer.c b/builtin/sequencer.c
index 56551bb..0f50942 100644
--- a/builtin/sequencer.c
+++ b/builtin/sequencer.c@@ -305,6 +305,8 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, argv_array_init(&array); argv_array_push(&array, "commit"); argv_array_push(&array, "-n"); + if (opts->quiet) + argv_array_push(&array, "-q"); if (opts->signoff) argv_array_push(&array, "-s");
@@ -539,6 +541,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) } if (opts->skip_empty && is_index_unchanged() == 1) { + if (!opts->quiet) warning(_("skipping %s... %s"), find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), msg.subject);
diff --git a/builtin/sequencer.h b/builtin/sequencer.h
index 86e2eee..e45411c 100644
--- a/builtin/sequencer.h
+++ b/builtin/sequencer.h@@ -33,6 +33,7 @@ struct replay_opts { int allow_empty_message; int keep_redundant_commits; int skip_empty; + int quiet; int mainline;
--
1.8.3.698.g079b096