path: root/branch.h
diff options
authorNguyễn Thái Ngọc Duy <>2019-03-29 10:38:59 (GMT)
committerJunio C Hamano <>2019-04-02 04:56:59 (GMT)
commitf4a4b9aca3cb70fabe3e856fa61ca35a99e2b8eb (patch)
tree98ad7f525239f864d4d81fd664261b9e59dc5192 /branch.h
parentaf9ded5b7007a4fa9844be7ac1c86f7a6ef2e56a (diff)
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: Signed-off-by: Nguyễn Thái Ngọc Duy <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'branch.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/branch.h b/branch.h
index 29c1afa..aed0459 100644
--- a/branch.h
+++ b/branch.h
@@ -64,7 +64,7 @@ extern int validate_new_branchname(const char *name, struct strbuf *ref, int for
* Remove information about the state of working on the current
* branch. (E.g., MERGE_HEAD)
-void remove_branch_state(struct repository *r);
+void remove_branch_state(struct repository *r, int verbose);
* Configure local branch "local" as downstream to branch "remote"