X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.c;h=f85c438284d6b810617595971d7e3ec2e79e3120;hb=2cb1ff9ac35ff043e377f78e36a57422a6846485;hp=025a97be0281b9fd3ccff2b36c03495b005ac4fe;hpb=fc545433bdab7ec17e6609d2249771d407370a4d;p=git.git diff --git a/branch.c b/branch.c index 025a97be0..f85c43828 100644 --- a/branch.c +++ b/branch.c @@ -160,7 +160,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; @@ -175,7 +176,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