X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.c;h=9971820a184d9713126c3c9f763dd8f6ec1b1a50;hb=7e521640c80b4bb871bca7a9259621a7abb303e7;hp=a715a1174982970943ed2c4fc1c2ab4906699fdc;hpb=e9bba5340e1ba370bb2f64a514c87fdaf417d6d7;p=git.git

diff --git a/branch.c b/branch.c
index a715a1174..9971820a1 100644
--- a/branch.c
+++ b/branch.c
@@ -3,7 +3,6 @@
 #include "refs.h"
 #include "remote.h"
 #include "commit.h"
-#include "sequencer.h"
 
 struct tracking {
 	struct refspec spec;
@@ -182,7 +181,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
 		const char *head;
 		unsigned char sha1[20];
 
-		head = resolve_ref("HEAD", sha1, 0, NULL);
+		head = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
 		if (!is_bare_repository() && head && !strcmp(head, ref->buf))
 			die("Cannot force update the current branch.");
 	}
@@ -280,5 +279,4 @@ void remove_branch_state(void)
 	unlink(git_path("MERGE_MSG"));
 	unlink(git_path("MERGE_MODE"));
 	unlink(git_path("SQUASH_MSG"));
-	remove_sequencer_state(0);
 }