]> git.ipfire.org Git - thirdparty/git.git/commit - path.c
Make sure refs/rewritten/ is per-worktree
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Thu, 7 Mar 2019 12:29:17 +0000 (19:29 +0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Mar 2019 02:57:47 +0000 (11:57 +0900)
commitb9317d55a37f93c47d48f12a7b3e45a71434d0e7
tree42b04d1a12063ffa4d3065c86c73c92033b4e007
parent90d31ff5d470286a8480311384429ebee8bbc939
Make sure refs/rewritten/ is per-worktree

a9be29c981 (sequencer: make refs generated by the `label` command
worktree-local, 2018-04-25) adds refs/rewritten/ as per-worktree
reference space. Unfortunately (my bad) there are a couple places that
need update to make sure it's really per-worktree.

 - add_per_worktree_entries_to_dir() is updated to make sure ref listing
   look at per-worktree refs/rewritten/ instead of per-repo one [1]

 - common_list[] is updated so that git_path() returns the correct
   location. This includes "rev-parse --git-path".

This mess is created by me. I started trying to fix it with the
introduction of refs/worktree, where all refs will be per-worktree
without special treatments. Unfortunate refs/rewritten came before
refs/worktree so this is all we can do.

This also fixes logs/refs/worktree not being per-worktree.

[1] note that ref listing still works sometimes. For example, if you
    have .git/worktrees/foo/refs/rewritten/bar AND the directory
    .git/worktrees/refs/rewritten, refs/rewritten/bar will show up.
    add_per_worktree_entries_to_dir() is only needed when the directory
    .git/worktrees/refs/rewritten is missing.

Reported-by: Phillip Wood <phillip.wood123@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
path.c
refs/files-backend.c
t/t1415-worktree-refs.sh