From: Junio C Hamano <gitster@pobox.com> Date: Tue, 9 Apr 2019 17:14:23 +0000 (+0900) Subject: Merge branch 'nd/rewritten-ref-is-per-worktree' X-Git-Tag: v2.22.0-rc0~129 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/917f2cd1c2396c694ae956a1a26d9c92bf50b847 Merge branch 'nd/rewritten-ref-is-per-worktree' "git rebase" uses the refs/rewritten/ hierarchy to store its intermediate states, which inherently makes the hierarchy per worktree, but it didn't quite work well. * nd/rewritten-ref-is-per-worktree: Make sure refs/rewritten/ is per-worktree files-backend.c: reduce duplication in add_per_worktree_entries_to_dir() files-backend.c: factor out per-worktree code in loose_fill_ref_dir() --- 917f2cd1c2396c694ae956a1a26d9c92bf50b847