From: Fabian Ruch Date: Fri, 11 Jul 2014 13:46:04 GMT Subject: Re: [PATCH RFC v2 07/19] rebase -i: The replay of root commits is not shown with --verbose Message-ID: <53BFEA9C.6010203@gmail.com> In-Reply-To: Hi Chris, you're the original author of the code touched by this patch. Is the second -q option really a simple copy-and-paste of the first or am I overlooking something here? I'd like to confirm this as, in retrospect, I feel a bit uncertain about the hasty claim in the log message. Kind regards, Fabian Fabian Ruch writes: > The command line used to recreate root commits specifies the > erroneous option `-q` which suppresses the commit summary message. > However, git-rebase--interactive tends to tell the user about the > commits it creates, if she wishes (cf. command line option > `--verbose`). The code parts handling non-root commits or squash > commits all output commit summary messages. Do not make the replay of > root commits an exception. Remove the option. > > It is OK to suppress the commit summary when git-commit is used to > initialize the authorship of the sentinel commit because the > existence of this additional commit is a detail of > git-rebase--interactive's implementation. The option `-q` was > probably introduced as a copy-and-paste error stemming from that part > of the root commit handling code. > > Signed-off-by: Fabian Ruch > --- > git-rebase--interactive.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 0af96f2..ff04d5d 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -511,7 +511,7 @@ do_pick () { > --no-post-rewrite -n -q -C $1 && > pick_one -n $1 && > git commit --allow-empty \ > - --amend --no-post-rewrite -n -q -C $1 \ > + --amend --no-post-rewrite -n -C $1 \ > ${gpg_sign_opt:+"$gpg_sign_opt"} || > die_with_patch $1 "Could not apply $1... $2" > else