diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-15 17:54:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-15 17:54:26 -0800 |
| commit | ab738b2f1f35fbc3658ac107e1ad55b21c1e0fbc (patch) | |
| tree | 8eb63219f3a49d742357586e6b924254a5adb834 /builtin/merge.c | |
| parent | 73b7e03e9e4fdd3e09c08ff9c2d215bcabc19f34 (diff) | |
| parent | bbd445d5efd415d43ac6102a3e9541b9ac4f0329 (diff) | |
Merge branch 'jc/forbid-head-as-tagname'
"git tag" has been taught to refuse to create refs/tags/HEAD
as such a tag will be confusing in the context of UI provided by
the Git Porcelain commands.
* jc/forbid-head-as-tagname:
tag: "git tag" refuses to use HEAD as a tagname
t5604: do not expect that HEAD can be a valid tagname
refs: drop strbuf_ prefix from helpers
refs: move ref name helpers around
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 51038eaca8..e32c99087f 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -498,7 +498,7 @@ static void merge_name(const char *remote, struct strbuf *msg) char *found_ref = NULL; int len, early; - strbuf_branchname(&bname, remote, 0); + copy_branchname(&bname, remote, 0); remote = bname.buf; oidclr(&branch_head, the_repository->hash_algo); |