diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-08-15 13:22:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-15 13:22:15 -0700 |
| commit | e7f86cb69de9c3b95c8c8816b51621c1d7910e02 (patch) | |
| tree | 5be466f67f045f9c1ab56411e7977ac5e66a4fe7 /remote.c | |
| parent | Merge branch 'ps/submodule-ref-format' (diff) | |
| parent | ref-filter: populate symref from iterator (diff) | |
| download | git-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 'remote.c')
| -rw-r--r-- | remote.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2354,7 +2354,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb, return 1; } -static int one_local_ref(const char *refname, const struct object_id *oid, +static int one_local_ref(const char *refname, const char *referent UNUSED, const struct object_id *oid, int flag UNUSED, void *cb_data) { @@ -2439,7 +2439,7 @@ struct stale_heads_info { struct refspec *rs; }; -static int get_stale_heads_cb(const char *refname, const struct object_id *oid, +static int get_stale_heads_cb(const char *refname, const char *referent UNUSED, const struct object_id *oid, int flags, void *cb_data) { struct stale_heads_info *info = cb_data; |