Signed-off-by: Felipe Contreras <felipe.contre...@gmail.com>
---
 Documentation/git-cherry-pick.txt |  6 +++++-
 Documentation/git-revert.txt      |  6 +++++-
 builtin/revert.c                  |  1 +
 sequencer.c                       | 11 +++++++----
 sequencer.h                       |  1 +
 5 files changed, 19 insertions(+), 6 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 6e7cb2a..7a7fde6 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -102,6 +102,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/sequencer.c b/sequencer.c
index c387828..d6199e4 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -395,6 +395,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");
@@ -634,9 +636,10 @@ static int do_pick_commit(struct commit *commit, struct 
replay_opts *opts)
        }
 
        if (opts->skip_empty && is_index_unchanged() == 1) {
-               warning(_("skipping %s... %s"),
-                       find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
-                       msg.subject);
+               if (!opts->quiet)
+                       warning(_("skipping %s... %s"),
+                               find_unique_abbrev(commit->object.sha1, 
DEFAULT_ABBREV),
+                               msg.subject);
                goto leave;
        }
        allow = allow_empty(opts, commit);
@@ -666,7 +669,7 @@ static void prepare_revs(struct replay_opts *opts)
        if (prepare_revision_walk(opts->revs))
                die(_("revision walk setup failed"));
 
-       if (!opts->revs->commits)
+       if (!opts->revs->commits && !opts->quiet)
                error(_("empty commit set passed"));
 }
 
diff --git a/sequencer.h b/sequencer.h
index 3b04844..d37c003 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -35,6 +35,7 @@ struct replay_opts {
        int allow_empty_message;
        int keep_redundant_commits;
        int skip_empty;
+       int quiet;
 
        int mainline;
 
-- 
1.8.4-fc

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to