зеркало из https://github.com/microsoft/git.git
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()
This commit is contained in:
Коммит
917f2cd1c2
3
path.c
3
path.c
|
@ -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" },
|
||||
|
|
|
@ -214,6 +214,33 @@ static void files_ref_path(struct files_ref_store *refs,
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Manually add refs/bisect, refs/rewritten and refs/worktree, which, being
|
||||
* per-worktree, might not appear in the directory listing for
|
||||
* refs/ in the main repo.
|
||||
*/
|
||||
static void add_per_worktree_entries_to_dir(struct ref_dir *dir, const char *dirname)
|
||||
{
|
||||
const char *prefixes[] = { "refs/bisect/", "refs/worktree/", "refs/rewritten/" };
|
||||
int ip;
|
||||
|
||||
if (strcmp(dirname, "refs/"))
|
||||
return;
|
||||
|
||||
for (ip = 0; ip < ARRAY_SIZE(prefixes); ip++) {
|
||||
const char *prefix = prefixes[ip];
|
||||
int prefix_len = strlen(prefix);
|
||||
struct ref_entry *child_entry;
|
||||
int pos;
|
||||
|
||||
pos = search_ref_dir(dir, prefix, prefix_len);
|
||||
if (pos >= 0)
|
||||
continue;
|
||||
child_entry = create_dir_entry(dir->cache, prefix, prefix_len, 1);
|
||||
add_entry_to_dir(dir, child_entry);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Read the loose references from the namespace dirname into dir
|
||||
* (without recursing). dirname must end with '/'. dir must be the
|
||||
|
@ -297,28 +324,7 @@ static void loose_fill_ref_dir(struct ref_store *ref_store,
|
|||
strbuf_release(&path);
|
||||
closedir(d);
|
||||
|
||||
/*
|
||||
* Manually add refs/bisect and refs/worktree, which, being
|
||||
* per-worktree, might not appear in the directory listing for
|
||||
* refs/ in the main repo.
|
||||
*/
|
||||
if (!strcmp(dirname, "refs/")) {
|
||||
int pos = search_ref_dir(dir, "refs/bisect/", 12);
|
||||
|
||||
if (pos < 0) {
|
||||
struct ref_entry *child_entry = create_dir_entry(
|
||||
dir->cache, "refs/bisect/", 12, 1);
|
||||
add_entry_to_dir(dir, child_entry);
|
||||
}
|
||||
|
||||
pos = search_ref_dir(dir, "refs/worktree/", 11);
|
||||
|
||||
if (pos < 0) {
|
||||
struct ref_entry *child_entry = create_dir_entry(
|
||||
dir->cache, "refs/worktree/", 11, 1);
|
||||
add_entry_to_dir(dir, child_entry);
|
||||
}
|
||||
}
|
||||
add_per_worktree_entries_to_dir(dir, dirname);
|
||||
}
|
||||
|
||||
static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
|
||||
|
|
|
@ -76,4 +76,39 @@ test_expect_success 'reflog of worktrees/xx/HEAD' '
|
|||
test_cmp expected actual.wt2
|
||||
'
|
||||
|
||||
test_expect_success 'for-each-ref from main repo' '
|
||||
mkdir fer1 &&
|
||||
git -C fer1 init repo &&
|
||||
test_commit -C fer1/repo initial &&
|
||||
git -C fer1/repo worktree add ../second &&
|
||||
git -C fer1/repo update-ref refs/bisect/main HEAD &&
|
||||
git -C fer1/repo update-ref refs/rewritten/main HEAD &&
|
||||
git -C fer1/repo update-ref refs/worktree/main HEAD &&
|
||||
git -C fer1/repo for-each-ref --format="%(refname)" | grep main >actual &&
|
||||
cat >expected <<-\EOF &&
|
||||
refs/bisect/main
|
||||
refs/rewritten/main
|
||||
refs/worktree/main
|
||||
EOF
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'for-each-ref from linked repo' '
|
||||
mkdir fer2 &&
|
||||
git -C fer2 init repo &&
|
||||
test_commit -C fer2/repo initial &&
|
||||
git -C fer2/repo worktree add ../second &&
|
||||
git -C fer2/second update-ref refs/bisect/second HEAD &&
|
||||
git -C fer2/second update-ref refs/rewritten/second HEAD &&
|
||||
git -C fer2/second update-ref refs/worktree/second HEAD &&
|
||||
git -C fer2/second for-each-ref --format="%(refname)" | grep second >actual &&
|
||||
cat >expected <<-\EOF &&
|
||||
refs/bisect/second
|
||||
refs/heads/second
|
||||
refs/rewritten/second
|
||||
refs/worktree/second
|
||||
EOF
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Загрузка…
Ссылка в новой задаче