aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/describe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-08-15 13:22:15 -0700
committerJunio C Hamano <gitster@pobox.com>2024-08-15 13:22:15 -0700
commite7f86cb69de9c3b95c8c8816b51621c1d7910e02 (patch)
tree5be466f67f045f9c1ab56411e7977ac5e66a4fe7 /builtin/describe.c
parentMerge branch 'ps/submodule-ref-format' (diff)
parentref-filter: populate symref from iterator (diff)
downloadgit-e7f86cb69de9c3b95c8c8816b51621c1d7910e02.tar.gz
git-e7f86cb69de9c3b95c8c8816b51621c1d7910e02.zip
Merge branch 'jc/refs-symref-referent'
The refs API has been taught to give symref target information to the users of ref iterators, allowing for-each-ref and friends to avoid an extra ref_resolve_* API call per a symbolic ref. * jc/refs-symref-referent: ref-filter: populate symref from iterator refs: add referent to each_ref_fn refs: keep track of unresolved reference value in iterators
Diffstat (limited to 'builtin/describe.c')
-rw-r--r--builtin/describe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/describe.c b/builtin/describe.c
index 954929c514..b43093c099 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -149,7 +149,7 @@ static void add_to_known_names(const char *path,
}
}
-static int get_name(const char *path, const struct object_id *oid,
+static int get_name(const char *path, const char *referent UNUSED, const struct object_id *oid,
int flag UNUSED, void *cb_data UNUSED)
{
int is_tag = 0;
ns'>+8 2011-07-22Documentation: minor grammatical fix in rev-list-options.txtJack Nagel1-1/+1 2011-07-21Documentation: git-filter-branch honors replacement refsPeter Collingbourne1-2/+3 2011-07-20remote-curl: Add a format check to parsing of info/refsJulian Phillips1-0/+2 2011-07-19git-config: Remove extra whitespacesPavan Kumar Sunkara1-2/+2 2011-07-06docs: document --textconv diff optionJeff King1-0/+11 2011-06-29test: skip clean-up when running under --immediate modeJunio C Hamano1-2/+10 2011-06-29"branch -d" can remove more than one branchesJunio C Hamano1-1/+1 2011-06-28git-svn: Correctly handle root commits in mergeinfo rangesMichael Haggerty2-3/+7 2011-06-28git-svn: Disambiguate rev-list arguments to improve error messageMichael Haggerty1-2/+2