Browse Source

Merge branch 'rs/merge-microcleanup' into maint

Code clean-up.

* rs/merge-microcleanup:
  merge: use skip_prefix()
maint
Junio C Hamano 8 years ago
parent
commit
afa6608b93
  1. 4
      builtin/merge.c

4
builtin/merge.c

@ -1126,8 +1126,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) @@ -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

Loading…
Cancel
Save