Merge branch 'fg/submodule-git-file-git-dir'

diff --git a/branch.c b/branch.c
index 1fe3078a6cade3c34c5dcd65977b286840bec6ee..d8098762f62a9dfb991f64702d34047182cfa951 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -3,6 +3,7 @@
 #include "refs.h"
 #include "remote.h"
 #include "commit.h"
+#include "sequencer.h"
 
 struct tracking {
        struct refspec spec;
@@ -135,23 +136,25 @@ static int setup_tracking(const char *new_ref, const char *orig_ref,
        return 0;
 }
 
-int validate_new_branchname(const char *name, struct strbuf *ref, int force)
+int validate_new_branchname(const char *name, struct strbuf *ref,
+                           int force, int attr_only)
 {
-       const char *head;
-       unsigned char sha1[20];
-
        if (strbuf_check_branch_ref(ref, name))
                die("'%s' is not a valid branch name.", name);
 
        if (!ref_exists(ref->buf))
                return 0;
-       else if (!force)
+       else if (!force && !attr_only)
                die("A branch named '%s' already exists.", ref->buf + strlen("refs/heads/"));
 
-       head = resolve_ref("HEAD", sha1, 0, NULL);
-       if (!is_bare_repository() && head && !strcmp(head, ref->buf))
-               die("Cannot force update the current branch.");
+       if (!attr_only) {
+               const char *head;
+               unsigned char sha1[20];
 
+               head = resolve_ref("HEAD", sha1, 0, NULL);
+               if (!is_bare_repository() && head && !strcmp(head, ref->buf))
+                       die("Cannot force update the current branch.");
+       }
        return 1;
 }
 
@@ -171,7 +174,8 @@ void create_branch(const char *head,
        if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
                explicit_tracking = 1;
 
-       if (validate_new_branchname(name, &ref, force || track == BRANCH_TRACK_OVERRIDE)) {
+       if (validate_new_branchname(name, &ref, force,
+                                   track == BRANCH_TRACK_OVERRIDE)) {
                if (!force)
                        dont_change_ref = 1;
                else
@@ -224,7 +228,7 @@ void create_branch(const char *head,
                         start_name);
 
        if (real_ref && track)
-               setup_tracking(name, real_ref, track);
+               setup_tracking(ref.buf+11, real_ref, track);
 
        if (!dont_change_ref)
                if (write_ref_sha1(lock, sha1, msg) < 0)
@@ -242,4 +246,5 @@ void remove_branch_state(void)
        unlink(git_path("MERGE_MSG"));
        unlink(git_path("MERGE_MODE"));
        unlink(git_path("SQUASH_MSG"));
+       remove_sequencer_state(0);
 }