Merge git://ozlabs.org/~paulus/gitk

diff --git a/branch.c b/branch.c
index d91a099fdd22b9131a1d2ddaf3778b645c53eca0..a715a1174982970943ed2c4fc1c2ab4906699fdc 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -191,7 +191,8 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
 
 void create_branch(const char *head,
                   const char *name, const char *start_name,
-                  int force, int reflog, enum branch_track track)
+                  int force, int reflog, int clobber_head,
+                  enum branch_track track)
 {
        struct ref_lock *lock = NULL;
        struct commit *commit;
@@ -206,7 +207,8 @@ void create_branch(const char *head,
                explicit_tracking = 1;
 
        if (validate_new_branchname(name, &ref, force,
-                                   track == BRANCH_TRACK_OVERRIDE)) {
+                                   track == BRANCH_TRACK_OVERRIDE ||
+                                   clobber_head)) {
                if (!force)
                        dont_change_ref = 1;
                else