diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-03-29 17:38:59 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-02 13:56:59 +0900 |
commit | f4a4b9aca3cb70fabe3e856fa61ca35a99e2b8eb (patch) | |
tree | 98ad7f525239f864d4d81fd664261b9e59dc5192 /branch.c | |
parent | checkout: advice how to get out of detached HEAD mode (diff) | |
download | tgif-f4a4b9aca3cb70fabe3e856fa61ca35a99e2b8eb.tar.xz |
checkout: inform the user when removing branch state
After a successful switch, if a merge, cherry-pick or revert is ongoing,
it is canceled. This behavior has been with us from the very early
beginning, soon after git-merge was created but never actually
documented [1]. It may be a good idea to be transparent and tell the
user if some operation is canceled.
I consider this a better way of telling the user than just adding a
sentence or two in git-checkout.txt, which will be mostly ignored
anyway.
PS. Originally I wanted to print more details like
warning: cancelling an in-progress merge from <SHA-1>
which may allow some level of undo if the user wants to. But that seems
a lot more work. Perhaps it can be improved later if people still want
that.
[1] ... and I will try not to argue whether it is a sensible behavior.
There is some more discussion here if people are interested:
CACsJy8Axa5WsLSjiscjnxVK6jQHkfs-gH959=YtUvQkWriAk5w@mail.gmail.com
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.c')
-rw-r--r-- | branch.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -337,11 +337,14 @@ void create_branch(struct repository *r, free(real_ref); } -void remove_branch_state(struct repository *r) +void remove_branch_state(struct repository *r, int verbose) { - unlink(git_path_cherry_pick_head(r)); - unlink(git_path_revert_head(r)); - unlink(git_path_merge_head(r)); + if (!unlink(git_path_cherry_pick_head(r)) && verbose) + warning(_("cancelling a cherry picking in progress")); + if (!unlink(git_path_revert_head(r)) && verbose) + warning(_("cancelling a revert in progress")); + if (!unlink(git_path_merge_head(r)) && verbose) + warning(_("cancelling a merge in progress")); unlink(git_path_merge_rr(r)); unlink(git_path_merge_msg(r)); unlink(git_path_merge_mode(r)); |