mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ks/branch-cleanup'

Browse Source 
Code clean-up.

* ks/branch-cleanup:
  builtin/branch: strip refs/heads/ using skip_prefix
  branch: update warning message shown when copying a misnamed branch
  branch: group related arguments of create_branch()
  branch: improve documentation and naming of create_branch() parameters
This commit is contained in:
Junio C Hamano
2017-12-27 11:16:25 -08:00
parent a13e45f1e7 255073ca59
commit 0faff988ee
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
branch.c
View File

@ -244,7 +244,7 @@ N_("\n"
"\"git push -u\" to set the upstream config as you push.");
void create_branch(const char *name, const char *start_name,
int force, int reflog, int clobber_head,
int force, int clobber_head_ok, int reflog,
int quiet, enum branch_track track)
{
struct commit *commit;
@ -258,7 +258,7 @@ void create_branch(const char *name, const char *start_name,
if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
explicit_tracking = 1;
if ((track == BRANCH_TRACK_OVERRIDE || clobber_head)
if ((track == BRANCH_TRACK_OVERRIDE || clobber_head_ok)
? validate_branchname(name, &ref)
: validate_new_branchname(name, &ref, force)) {
if (!force)