Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Tell between packed, unpacked and symbolic refs.
[gitweb.git]
/
builtin-fmt-merge-msg.c
diff --git
a/builtin-fmt-merge-msg.c
b/builtin-fmt-merge-msg.c
index b93c17c2f036b972ed6be3b5029251681acfeec7..3d3097d299d4c964e1acfff7a365501a8bd53587 100644
(file)
--- a/
builtin-fmt-merge-msg.c
+++ b/
builtin-fmt-merge-msg.c
@@
-277,7
+277,7
@@
int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
usage(fmt_merge_msg_usage);
/* get current branch */
- current_branch = resolve_ref("HEAD", head_sha1, 1);
+ current_branch = resolve_ref("HEAD", head_sha1, 1
, NULL
);
if (!strncmp(current_branch, "refs/heads/", 11))
current_branch += 11;