development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 11:07:55 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'rs/merge-microcleanup'

Browse source 
Code clean-up.

* rs/merge-microcleanup:
  merge: use skip_prefix()
This commit is contained in:
Junio C Hamano 2017-08-22 10:29:14 -07:00
parent 2d68161a23 de3ce210ed
commit e2a2a1daac
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

@ -1117,8 +1117,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