From patchwork Mon Dec 23 18:49:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11308627 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9950213A4 for ; Mon, 23 Dec 2019 18:50:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7544920643 for ; Mon, 23 Dec 2019 18:50:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PxZsFGsf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726882AbfLWSuH (ORCPT ); Mon, 23 Dec 2019 13:50:07 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:41895 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726787AbfLWSuG (ORCPT ); Mon, 23 Dec 2019 13:50:06 -0500 Received: by mail-ed1-f65.google.com with SMTP id c26so16113468eds.8 for ; Mon, 23 Dec 2019 10:50:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=qn1fi0por3x0HTg6UJQb4898IQuTlhoQdD5bPS1bny4=; b=PxZsFGsfVAN98oR6DkyEORKZysp5xd7w4YyNjthDDpseD/ZMNqQt6oCx7B4/bBYWJW yUSuBcZXSrDzbL+Luq0wngzTXSJ3tP4HhllOELnU+VCIKjRfC8ORhHvAkNpgdekPu09V EU40CWN4qA71vPr4SmjIMNbAT5xk39jdkv59NbD4DRX4vDBJtMd0uQY0/wyMqbPPVMaa 2kh6sZHFdzLfNb8n/4amQGtJ8JOcR/puvIUTO5KqsrLYVR8g32+Vb+XiFnqVvYxsbn4M iU2QeGOc8PqryE38E+LlsvCGkBtpNOg1fZH1fySEbodJTpInT6GxRR+3OHpwOzya3JQX c7kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=qn1fi0por3x0HTg6UJQb4898IQuTlhoQdD5bPS1bny4=; b=QvoeDLb3vaD0w7EgLBiDmXsmmXFGBo/r5tCrJYBBQ0cZTSf1j+D69r5Vuvc9zumjhb dCRiaYJdy5g/pi8cx0mGzdJSyh+FZaW0JIC7/aGPQfgAzwoUo2IVjJNHrI+bjRHx2e2m HBz4mbq6NVbLWt7I9qmfMcnOaFL+FKB30b/cKBBCjDSJXWKv5GBoJqcUntlztSAIufI2 ISGUossiHfiNlpYIc1CC82Y85JPHKiO9Jp5vjFg6E0Re+gcRgyf+8HVDRyqcmkTAO2gY OX5b5ulbfPjmo4f+euOKD0FWg52LM1Bgb3zn1SUV/flmN3umo9sZQ4TX2kHHtNJzdLGC zz5A== X-Gm-Message-State: APjAAAXOSJzZEklKOt4haRzx2Qqiz0wg9YHv3JP6EcIA4mUpulbRXeZ6 4/VqGakGQTFtX66aiP5VCpFMW3Ud X-Google-Smtp-Source: APXvYqybEbnT+1au4Bbmlu420OMb3DnHhuuIv0joPG/zQJ6WEoqfn0iQJ72u07kwnsnqg0p8r/F4zg== X-Received: by 2002:a50:9ee8:: with SMTP id a95mr34282351edf.86.1577127004166; Mon, 23 Dec 2019 10:50:04 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i4sm2327153edr.59.2019.12.23.10.50.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Dec 2019 10:50:03 -0800 (PST) Message-Id: <478479358ff21afe6b8374f076d2ed5e139ae6c0.1577127000.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Mon, 23 Dec 2019 18:49:48 +0000 Subject: [PATCH v2 04/15] rebase: make sure to pass along the quiet flag to the sequencer Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes.Schindelin@gmx.de, phillip.wood@dunelm.org.uk, liu.denton@gmail.com, gitster@pobox.com, plroskin@gmail.com, alban.gruin@gmail.com, szeder.dev@gmail.com, Junio C Hamano , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Signed-off-by: Elijah Newren --- builtin/rebase.c | 3 ++- t/t3400-rebase.sh | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 32026a62e8..5014c9a437 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -126,6 +126,7 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts) replay.keep_redundant_commits = (opts->empty == EMPTY_KEEP); replay.ask_on_initially_empty = (opts->empty == EMPTY_ASK && !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)); + replay.quiet = !(opts->flags & REBASE_NO_QUIET); replay.verbose = opts->flags & REBASE_VERBOSE; replay.reschedule_failed_exec = opts->reschedule_failed_exec; replay.committer_date_is_author_date = @@ -1502,7 +1503,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) N_("allow pre-rebase hook to run")), OPT_NEGBIT('q', "quiet", &options.flags, N_("be quiet. implies --no-stat"), - REBASE_NO_QUIET| REBASE_VERBOSE | REBASE_DIFFSTAT), + REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT), OPT_BIT('v', "verbose", &options.flags, N_("display a diffstat of what changed upstream"), REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT), diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 221b35f2df..79762b989a 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -206,12 +206,18 @@ test_expect_success 'cherry-picked commits and fork-point work together' ' test_cmp expect D ' -test_expect_success 'rebase -q is quiet' ' +test_expect_success 'rebase --am -q is quiet' ' git checkout -b quiet topic && git rebase -q master >output.out 2>&1 && test_must_be_empty output.out ' +test_expect_success 'rebase --merge -q is quiet' ' + git checkout -B quiet topic && + git rebase --merge -q master >output.out 2>&1 && + test_must_be_empty output.out +' + test_expect_success 'Rebase a commit that sprinkles CRs in' ' ( echo "One" &&