Re: [PATCH v6 07/27] checkout: inform the user when removing branch state

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 2, 2019, 17:51 UTC
Message-ID: <xmqqa7dw4966.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190702090308.GA27775@ash>

Duy Nguyen <pclouds@gmail.com> writes:

Show 8 quoted lines

> I agree, this is not "canceling". I think this series causes conflicts
> with pw/clean-sequencer-state-upon-final-commit and the warning is
> accidentally enabled (partly my fault since I named the argument
> "verbose").
>
> Junio, in this conflict resolution (merging nd/switch-and-restore to
> next), we should pass '0' instead of 'verbose' to
> sequencer_post_commit_cleanup().

Thanks for an update to the merge-fix. What should the name of the parameter to the sequencer_post_commit_cleanup() funcion be then, though? Perhaps we'd want an update after the topic graduates to the 'master' branch.

Show 18 quoted lines

>
> diff --cc builtin/commit.c
> index 1921401117,fa5982cc86..145d50caf0
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@@ -1658,7 -1666,8 +1658,7 @@@ int cmd_commit(int argc, const char **a
>   		die("%s", err.buf);
>   	}
>   
> - 	sequencer_post_commit_cleanup(the_repository);
>  -	unlink(git_path_cherry_pick_head(the_repository));
>  -	unlink(git_path_revert_head(the_repository));
> ++	sequencer_post_commit_cleanup(the_repository, verbose);
>   	unlink(git_path_merge_head(the_repository));
>   	unlink(git_path_merge_msg(the_repository));
>   	unlink(git_path_merge_mode(the_repository));
> --
> Duy