Merge branch 'nd/rewritten-ref-is-per-worktree'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Apr 2019 17:14:23 +0000 (02:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Apr 2019 17:14:23 +0000 (02:14 +0900)
"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()

1  2 
path.c
refs/files-backend.c
diff --cc path.c
Simple merge
Simple merge