X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.c;h=d7fd267b7ed189eaca02caf6628969b50169ec45;hb=50c94032844bb184cdeff7779be3b6a23e04d312;hp=a6b6722e24bc196a54be5ab1240e8932e53483e2;hpb=a7eff1e027270062c4c08f11d63b4103f3d917fe;p=git.git diff --git a/branch.c b/branch.c index a6b6722e2..d7fd267b7 100644 --- a/branch.c +++ b/branch.c @@ -159,7 +159,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; @@ -174,7 +175,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