mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 22:46:09 +02:00
Code

Merge branch 'rs/merge-microcleanup' into maint 

Code clean-up.

* rs/merge-microcleanup:
  merge: use skip_prefix()
This commit is contained in:
Junio C Hamano 2017-09-10 17:03:02 +09:00
parent c580ce194f de3ce210ed
commit afa6608b93
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge.c
View File

@ -1126,8 +1126,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* current branch.
*/
branch = branch_to_free = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
if (branch && starts_with(branch, "refs/heads/"))
branch += 11;
if (branch)
skip_prefix(branch, "refs/heads/", &branch);
if (!branch || is_null_oid(&head_oid))
head_commit = NULL;
else