diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-08-23 19:37:01 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-24 14:58:47 -0700 |
| commit | acd9544a8fdcf8095c82c91365c45dcb93112be3 (patch) | |
| tree | 0b2e19104274ef37dab7c5390134a38cd550f9b9 /t | |
| parent | files-backend: make reflog iterator go through per-worktree reflog (diff) | |
| download | tgif-acd9544a8fdcf8095c82c91365c45dcb93112be3.tar.xz | |
revision.c: --reflog add HEAD reflog from all worktrees
Note that add_other_reflogs_to_pending() is a bit inefficient, since
it scans reflog for all refs of each worktree, including shared refs,
so the shared ref's reflog is scanned over and over again.
We could update refs API to pass "per-worktree only" flag to avoid
that. But long term we should be able to obtain a "per-worktree only"
ref store and would need to revert the changes in reflog iteration
API. So let's just wait until then.
add_reflogs_to_pending() is called by reachable.c so by default "git
prune" will examine reflog from all worktrees.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5304-prune.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index 683bdb031c..6694c19a1e 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -304,4 +304,20 @@ test_expect_success 'prune: handle HEAD in multiple worktrees' ' test_cmp third-worktree/blob actual ' +test_expect_success 'prune: handle HEAD reflog in multiple worktrees' ' + git config core.logAllRefUpdates true && + echo "lost blob for third-worktree" >expected && + ( + cd third-worktree && + cat ../expected >blob && + git add blob && + git commit -m "second commit in third" && + git reset --hard HEAD^ + ) && + git prune --expire=now && + SHA1=`git hash-object expected` && + git -C third-worktree show "$SHA1" >actual && + test_cmp expected actual +' + test_done |