diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-01 14:38:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-01 14:38:55 -0800 |
| commit | 510a27e9e48ae13ebf94a71041878445aba29f8c (patch) | |
| tree | 2d3d2ee8390991d5207f50308fd1a3493a3d27a9 /refs/debug.c | |
| parent | 221c3daef41bdd7eebd5f45d711e847d0a85aa86 (diff) | |
| parent | d699d15c328b03fd822d3950f7ed76debef02c26 (diff) | |
| download | git-510a27e9e48ae13ebf94a71041878445aba29f8c.tar.gz | |
Merge branch 'ps/reflog-list' into HEAD
"git reflog" learned a "list" subcommand that enumerates known reflogs.
* ps/reflog-list:
builtin/reflog: introduce subcommand to list reflogs
refs: stop resolving ref corresponding to reflogs
refs: drop unused params from the reflog iterator callback
refs: always treat iterators as ordered
refs/files: sort merged worktree and common reflogs
refs/files: sort reflogs returned by the reflog iterator
dir-iterator: support iteration in sorted order
dir-iterator: pass name to `prepare_next_entry_data()` directly
Diffstat (limited to 'refs/debug.c')
| -rw-r--r-- | refs/debug.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/refs/debug.c b/refs/debug.c index 634681ca44..c7531b17f0 100644 --- a/refs/debug.c +++ b/refs/debug.c @@ -181,7 +181,6 @@ static int debug_ref_iterator_advance(struct ref_iterator *ref_iterator) trace_printf_key(&trace_refs, "iterator_advance: %s (0)\n", diter->iter->refname); - diter->base.ordered = diter->iter->ordered; diter->base.refname = diter->iter->refname; diter->base.oid = diter->iter->oid; diter->base.flags = diter->iter->flags; @@ -222,7 +221,7 @@ debug_ref_iterator_begin(struct ref_store *ref_store, const char *prefix, drefs->refs->be->iterator_begin(drefs->refs, prefix, exclude_patterns, flags); struct debug_ref_iterator *diter = xcalloc(1, sizeof(*diter)); - base_ref_iterator_init(&diter->base, &debug_ref_iterator_vtable, 1); + base_ref_iterator_init(&diter->base, &debug_ref_iterator_vtable); diter->iter = res; trace_printf_key(&trace_refs, "ref_iterator_begin: \"%s\" (0x%x)\n", prefix, flags); |