Fabian Ruch <bafain@xxxxxxxxx> writes:
> The command line used to recreate root commits specifies the
> effectless option `-C`. It is used to reuse commit message and
> authorship from the named commit but the commit being amended here,
> which is the sentinel commit, already carries the authorship and log
> message of the processed commit. Note that the committer email and
> commit date fields do not match the root commit either way. Remove
> the option. However, `-C` (other than `-c`) does not invoke the
> editor and the `--amend` option invokes it by default. Disable editor
> invocation again by specifying `--no-edit`.
I'd say this is a no-value change, in the sense that it can be
written either way for the same effect and if the original were
written with "--amend --no-edit" then there would be no reason to
change it to "-C $1" because such a change would also be equally a
no-value change.
What exactly are we gaining? Performance? Correctness?
> Signed-off-by: Fabian Ruch <bafain@xxxxxxxxx>
> ---
> 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 ff04d5d..17836d5 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 -C $1 \
> + --amend --no-post-rewrite -n --no-edit \
> ${gpg_sign_opt:+"$gpg_sign_opt"} ||
> die_with_patch $1 "Could not apply $1... $2"
> else
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html