summaryrefslogtreecommitdiff
path: root/builtin-show-ref.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-21 00:40:28 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-21 00:40:28 -0700
commiteaf12a8c7d844be947c29954b658c17996abcd25 (patch)
tree11bac4c4b10036374b5cc6736fcdf7eee2054c58 /builtin-show-ref.c
parent9c13359aaf3176428603cc9dfbdf30da889ab3d3 (diff)
parent968846015229fe0fec28e3c85db722e131c15f93 (diff)
downloadgit-eaf12a8c7d844be947c29954b658c17996abcd25.tar.gz
Merge branch 'lt/refs' into jc/lt-ref2-with-lt-refs
* lt/refs: (58 commits) git-pack-refs --prune pack-refs: do not pack symbolic refs. Tell between packed, unpacked and symbolic refs. Add callback data to for_each_ref() family. symbolit-ref: fix resolve_ref conversion. Fix broken sha1 locking fsck-objects: adjust to resolve_ref() clean-up. gitignore: git-pack-refs is a generated file. wt-status: use simplified resolve_ref to find current branch Fix t1400-update-ref test minimally Enable the packed refs file format Make ref resolution saner Add support for negative refs Start handling references internally as a sorted in-memory list gitweb fix validating pg (page) parameter git-repack(1): document --window and --depth git-apply(1): document --unidiff-zero gitweb: fix warnings in PATH_INFO code and add export_ok/strict_export upload-archive: monitor child communication even more carefully. gitweb: export options ...
Diffstat (limited to 'builtin-show-ref.c')
-rw-r--r--builtin-show-ref.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-show-ref.c b/builtin-show-ref.c
index fab359bb42..12c457c3c1 100644
--- a/builtin-show-ref.c
+++ b/builtin-show-ref.c
@@ -9,7 +9,7 @@ static int deref_tags = 0, show_head = 0, tags_only = 0, heads_only = 0,
found_match = 0, verify = 0, quiet = 0, hash_only = 0;
static const char **pattern;
-static int show_ref(const char *refname, const unsigned char *sha1)
+static int show_ref(const char *refname, const unsigned char *sha1, int flag, void *cbdata)
{
struct object *obj;
@@ -109,8 +109,8 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
usage(show_ref_usage);
}
if (show_head)
- head_ref(show_ref);
- for_each_ref(show_ref);
+ head_ref(show_ref, NULL);
+ for_each_ref(show_ref, NULL);
if (!found_match) {
if (verify && !quiet)
die("No match");