diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-08-23 19:37:00 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-24 14:57:56 -0700 |
| commit | 944b4e3013d6e21b1ecd2f2579395341f2cc8b7b (patch) | |
| tree | 85c0edfc4b223a251324b7ece3023cd25152f378 /resolve-undo.c | |
| parent | revision.c: --all adds HEAD from all worktrees (diff) | |
| download | tgif-944b4e3013d6e21b1ecd2f2579395341f2cc8b7b.tar.xz | |
files-backend: make reflog iterator go through per-worktree reflog
refs/bisect is unfortunately per-worktree, so we need to look in
per-worktree logs/refs/bisect in addition to per-repo logs/refs. The
current iterator only goes through per-repo logs/refs.
Use merge iterator to walk two ref stores at the same time and pick
per-worktree refs from the right iterator.
PS. Note the unsorted order of for_each_reflog in the test. This is
supposed to be OK, for now. If we enforce order on for_each_reflog()
then some more work will be required.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions