diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-09 17:14:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-09 17:14:23 (GMT) |
| commit | 917f2cd1c2396c694ae956a1a26d9c92bf50b847 (patch) | |
| tree | a0b61242c52ae6ace6fc51d084b8dc7bb628b6d0 /path.c | |
| parent | 1828e52efcffe75707b88345f025c3ee4114864a (diff) | |
| parent | b9317d55a37f93c47d48f12a7b3e45a71434d0e7 (diff) | |
| download | git-917f2cd1c2396c694ae956a1a26d9c92bf50b847.zip git-917f2cd1c2396c694ae956a1a26d9c92bf50b847.tar.gz git-917f2cd1c2396c694ae956a1a26d9c92bf50b847.tar.bz2 | |
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()
Diffstat (limited to 'path.c')
| -rw-r--r-- | path.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -115,10 +115,13 @@ static struct common_dir common_list[] = { { 1, 1, 0, "logs" }, { 1, 1, 1, "logs/HEAD" }, { 0, 1, 1, "logs/refs/bisect" }, + { 0, 1, 1, "logs/refs/rewritten" }, + { 0, 1, 1, "logs/refs/worktree" }, { 0, 1, 0, "lost-found" }, { 0, 1, 0, "objects" }, { 0, 1, 0, "refs" }, { 0, 1, 1, "refs/bisect" }, + { 0, 1, 1, "refs/rewritten" }, { 0, 1, 1, "refs/worktree" }, { 0, 1, 0, "remotes" }, { 0, 1, 0, "worktrees" }, |