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

Merge branch 'ak/protect-any-current-branch'

Browse Source 
* ak/protect-any-current-branch:
  branch: missing space fix at line 313
This commit is contained in:
Junio C Hamano
2022-01-12 15:11:41 -08:00
parent c9c082850d 68d924e1de
commit 2a72807f6d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
branch.c
View File

@ -310,7 +310,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref, int force)
worktrees = get_worktrees(); worktrees = get_worktrees();
wt = find_shared_symref(worktrees, "HEAD", ref->buf); wt = find_shared_symref(worktrees, "HEAD", ref->buf);
if (wt && !wt->is_bare) if (wt && !wt->is_bare)
die(_("cannot force update the branch '%s'" die(_("cannot force update the branch '%s' "
"checked out at '%s'"), "checked out at '%s'"),
ref->buf + strlen("refs/heads/"), wt->path); ref->buf + strlen("refs/heads/"), wt->path);
free_worktrees(worktrees); free_worktrees(worktrees);