Merge branch 'md/url-parse-harden'

diff --git a/branch.c b/branch.c
index 1db0601a1124be0dcb83c4805e37baa55bfff5b5..e70838fb872f98820a641ccaccc06fd4c0c381f7 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -5,6 +5,7 @@
 #include "refs.h"
 #include "refspec.h"
 #include "remote.h"
+#include "sequencer.h"
 #include "commit.h"
 #include "worktree.h"
 
@@ -268,7 +269,7 @@ void create_branch(struct repository *r,
        }
 
        real_ref = NULL;
-       if (get_oid(start_name, &oid)) {
+       if (get_oid_mb(start_name, &oid)) {
                if (explicit_tracking) {
                        if (advice_set_upstream_failure) {
                                error(_(upstream_missing), start_name);
@@ -347,8 +348,7 @@ void remove_merge_branch_state(struct repository *r)
 
 void remove_branch_state(struct repository *r)
 {
-       unlink(git_path_cherry_pick_head(r));
-       unlink(git_path_revert_head(r));
+       sequencer_post_commit_cleanup(r);
        unlink(git_path_squash_msg(r));
        remove_merge_branch_state(r);
 }