diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-21 09:02:01 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-21 09:02:01 +0400 |
| commit | 8da197755450d4f16018bd4b5486dc8ed88b0f2a (patch) | |
| tree | 9317d63e33d83995b6346eea465a4d290f991087 /builtin-fmt-merge-msg.c | |
| parent | cb5d709ff8a4bae19d57a470ba2b137c25938a44 (diff) | |
Tell between packed, unpacked and symbolic refs.
This adds a "int *flag" parameter to resolve_ref() and makes
for_each_ref() family to call callback function with an extra
"int flag" parameter. They are used to give two bits of
information (REF_ISSYMREF and REF_ISPACKED) about the ref.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-fmt-merge-msg.c')
| -rw-r--r-- | builtin-fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c index b93c17c2f0..3d3097d299 100644 --- 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; |