summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-01-12 15:11:41 -0800
committerJunio C Hamano <gitster@pobox.com>2022-01-12 15:11:41 -0800
commit2a72807f6d6e0a7df68ce46f1ce201ba23e6625d (patch)
tree20c4041b4b948cb11904f3032686a969061264f0
parentc9c082850d263f073483ebcaa118c3f8be2061c4 (diff)
parent68d924e1de83b1e865acdca22b17a20fdec3add6 (diff)
Merge branch 'ak/protect-any-current-branch'
* ak/protect-any-current-branch: branch: missing space fix at line 313
-rw-r--r--branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/branch.c b/branch.c
index 829130bb11..5d20a2e848 100644
--- a/branch.c
+++ b/branch.c
@@ -310,7 +310,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref, int force)
worktrees = get_worktrees();
wt = find_shared_symref(worktrees, "HEAD", ref->buf);
if (wt && !wt->is_bare)
- die(_("cannot force update the branch '%s'"
+ die(_("cannot force update the branch '%s' "
"checked out at '%s'"),
ref->buf + strlen("refs/heads/"), wt->path);
free_worktrees(worktrees);