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)
commit917f2cd1c2396c694ae956a1a26d9c92bf50b847
treea0b61242c52ae6ace6fc51d084b8dc7bb628b6d0
parent1828e52efcffe75707b88345f025c3ee4114864a
parentb9317d55a37f93c47d48f12a7b3e45a71434d0e7
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()
path.c
refs/files-backend.c