From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Contreras Subject: [PATCH v5 13/36] revert/cherry-pick: add --quiet option Date: Sun, 9 Jun 2013 14:24:27 -0500 Message-ID: <1370805890-3453-14-git-send-email-felipe.contreras@gmail.com> References: <1370805890-3453-1-git-send-email-felipe.contreras@gmail.com> Cc: Junio C Hamano , Ramkumar Ramachandra , Jonathan Nieder , Martin von Zweigbergk , Felipe Contreras To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Jun 09 21:27:34 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UllH3-0003Xe-Es for gcvg-git-2@plane.gmane.org; Sun, 09 Jun 2013 21:27:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752267Ab3FIT1X (ORCPT ); Sun, 9 Jun 2013 15:27:23 -0400 Received: from mail-ob0-f171.google.com ([209.85.214.171]:59492 "EHLO mail-ob0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752250Ab3FIT1V (ORCPT ); Sun, 9 Jun 2013 15:27:21 -0400 Received: by mail-ob0-f171.google.com with SMTP id dn14so9072441obc.16 for ; Sun, 09 Jun 2013 12:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=3JP+WIGkB5O85tTcrDZJ3EvWVpEJmFEjBL/JLY6yV+A=; b=TgiYzuzkAQKpYHDMkbBSz8wvmCDQ3HMRC/H/oh4g/u9dTRx8pPRVCPqww112ocHbqy ldsp/cck/+aIUQ6284866ed8zVosoSyowz3Uq+EPYayF29iOy7enkmtE3vl9OQr2yiHv btTFZvZB62Qn3Xhl1Iwp2dayR1+rcHzVMESBJx0bKLcDR4w7FKOZ2dl1d0r/tKy+RloI mSH8UTystH5NQy6XUT+HukXDGZQAjgMIwANEzkKupK0V74WCaDKhY1cwunfcOlqXSRFc yzr33T/LLhMllzyEExaZkiRrtysjDcYzMMAjfyGtWLYSPlPDwnl0ZCSPo1ViT/+tkS+z b8ZQ== X-Received: by 10.182.92.225 with SMTP id cp1mr5453379obb.97.1370806041101; Sun, 09 Jun 2013 12:27:21 -0700 (PDT) Received: from localhost (187-163-100-70.static.axtel.net. [187.163.100.70]) by mx.google.com with ESMTPSA id b5sm15943521oby.12.2013.06.09.12.27.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Jun 2013 12:27:20 -0700 (PDT) X-Mailer: git-send-email 1.8.3.698.g079b096 In-Reply-To: <1370805890-3453-1-git-send-email-felipe.contreras@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Felipe Contreras --- 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] ... +'git cherry-pick' [-q] [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] ... 'git cherry-pick' --continue 'git cherry-pick' --quit 'git cherry-pick' --abort @@ -51,6 +51,10 @@ OPTIONS feed all ... 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] ... +'git revert' [-q] [--[no-]edit] [-n] [-m parent-number] [-s] ... '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