rebase: make sure to pass along the quiet flag to the sequencer

newren · gitster · commit 55d2b6d785da · 2020-02-16T15:40:42.000-08:00
Signed-off-by: Elijah Newren &lt;newren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/rebase.c b/builtin/rebase.c
@@ -120,6 +120,7 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 	replay.allow_empty_message = opts->allow_empty_message;
 	replay.drop_redundant_commits = (opts->empty == EMPTY_DROP);
 	replay.keep_redundant_commits = (opts->empty == EMPTY_KEEP);
+	replay.quiet = !(opts->flags & REBASE_NO_QUIET);
 	replay.verbose = opts->flags & REBASE_VERBOSE;
 	replay.reschedule_failed_exec = opts->reschedule_failed_exec;
 	replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
@@ -1476,7 +1477,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
@@ -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" &&

Original file line number	Diff line number	Diff line change
`@@ -206,12 +206,18 @@ test_expect_success 'cherry-picked commits and fork-point work together' '`
`206`	`206`	`test_cmp expect D`
`207`	`207`	`'`
`208`	`208`
`209`		`-test_expect_success 'rebase -q is quiet' '`
	`209`	`+test_expect_success 'rebase --am -q is quiet' '`
`210`	`210`	`git checkout -b quiet topic &&`
`211`	`211`	`git rebase -q master >output.out 2>&1 &&`
`212`	`212`	`test_must_be_empty output.out`
`213`	`213`	`'`
`214`	`214`
	`215`	`+test_expect_success 'rebase --merge -q is quiet' '`
	`216`	`+ git checkout -B quiet topic &&`
	`217`	`+ git rebase --merge -q master >output.out 2>&1 &&`
	`218`	`+ test_must_be_empty output.out`
	`219`	`+'`
	`220`	`+`
`215`	`221`	`test_expect_success 'Rebase a commit that sprinkles CRs in' '`
`216`	`222`	`(`
`217`	`223`	`echo "One" &&`