mirror of
https://github.com/git/git.git
synced 2024-06-03 14:36:10 +02:00
944b4e3013
refs/bisect is unfortunately per-worktree, so we need to look in per-worktree logs/refs/bisect in addition to per-repo logs/refs. The current iterator only goes through per-repo logs/refs. Use merge iterator to walk two ref stores at the same time and pick per-worktree refs from the right iterator. PS. Note the unsorted order of for_each_reflog in the test. This is supposed to be OK, for now. If we enforce order on for_each_reflog() then some more work will be required. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
83 lines
2.0 KiB
Bash
Executable File
83 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test worktree ref store api'
|
|
|
|
. ./test-lib.sh
|
|
|
|
RWT="test-ref-store worktree:wt"
|
|
RMAIN="test-ref-store worktree:main"
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit first &&
|
|
git worktree add -b wt-master wt &&
|
|
(
|
|
cd wt &&
|
|
test_commit second
|
|
)
|
|
'
|
|
|
|
test_expect_success 'resolve_ref(<shared-ref>)' '
|
|
SHA1=`git rev-parse master` &&
|
|
echo "$SHA1 refs/heads/master 0x0" >expected &&
|
|
$RWT resolve-ref refs/heads/master 0 >actual &&
|
|
test_cmp expected actual &&
|
|
$RMAIN resolve-ref refs/heads/master 0 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'resolve_ref(<per-worktree-ref>)' '
|
|
SHA1=`git -C wt rev-parse HEAD` &&
|
|
echo "$SHA1 refs/heads/wt-master 0x1" >expected &&
|
|
$RWT resolve-ref HEAD 0 >actual &&
|
|
test_cmp expected actual &&
|
|
|
|
SHA1=`git rev-parse HEAD` &&
|
|
echo "$SHA1 refs/heads/master 0x1" >expected &&
|
|
$RMAIN resolve-ref HEAD 0 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'create_symref(FOO, refs/heads/master)' '
|
|
$RWT create-symref FOO refs/heads/master nothing &&
|
|
echo refs/heads/master >expected &&
|
|
git -C wt symbolic-ref FOO >actual &&
|
|
test_cmp expected actual &&
|
|
|
|
$RMAIN create-symref FOO refs/heads/wt-master nothing &&
|
|
echo refs/heads/wt-master >expected &&
|
|
git symbolic-ref FOO >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'for_each_reflog()' '
|
|
echo $_z40 > .git/logs/PSEUDO-MAIN &&
|
|
mkdir -p .git/logs/refs/bisect &&
|
|
echo $_z40 > .git/logs/refs/bisect/random &&
|
|
|
|
echo $_z40 > .git/worktrees/wt/logs/PSEUDO-WT &&
|
|
mkdir -p .git/worktrees/wt/logs/refs/bisect &&
|
|
echo $_z40 > .git/worktrees/wt/logs/refs/bisect/wt-random &&
|
|
|
|
$RWT for-each-reflog | cut -c 42- | sort >actual &&
|
|
cat >expected <<-\EOF &&
|
|
HEAD 0x1
|
|
PSEUDO-WT 0x0
|
|
refs/bisect/wt-random 0x0
|
|
refs/heads/master 0x0
|
|
refs/heads/wt-master 0x0
|
|
EOF
|
|
test_cmp expected actual &&
|
|
|
|
$RMAIN for-each-reflog | cut -c 42- | sort >actual &&
|
|
cat >expected <<-\EOF &&
|
|
HEAD 0x1
|
|
PSEUDO-MAIN 0x0
|
|
refs/bisect/random 0x0
|
|
refs/heads/master 0x0
|
|
refs/heads/wt-master 0x0
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|