diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:10:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:10:04 -0700 |
| commit | 421ec4f8d1f616ba3cb82204e9973be45b61eea0 (patch) | |
| tree | 1e10a75548a514ba5be98dd3431c1e0713ee9f07 /t | |
| parent | Merge branch 'mb/fast-import-delete-root' into maint (diff) | |
| parent | reachable.c: add HEAD to reachability starting commits (diff) | |
| download | tgif-421ec4f8d1f616ba3cb82204e9973be45b61eea0.tar.xz | |
Merge branch 'mk/reachable-protect-detached-head' into maint
Reachability check (used in "git prune" and friends) did not add a
detached HEAD as a starting point to traverse objects still in use.
* mk/reachable-protect-detached-head:
reachable.c: add HEAD to reachability starting commits
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5304-prune.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index 377d3d3899..01c6a3fc1d 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -104,6 +104,28 @@ test_expect_success 'prune: prune unreachable heads' ' ' +test_expect_success 'prune: do not prune detached HEAD with no reflog' ' + + git checkout --detach --quiet && + git commit --allow-empty -m "detached commit" && + # verify that there is no reflogs + # (should be removed and disabled by previous test) + test ! -e .git/logs && + git prune -n >prune_actual && + : >prune_expected && + test_cmp prune_actual prune_expected + +' + +test_expect_success 'prune: prune former HEAD after checking out branch' ' + + head_sha1=$(git rev-parse HEAD) && + git checkout --quiet master && + git prune -v >prune_actual && + grep "$head_sha1" prune_actual + +' + test_expect_success 'prune: do not prune heads listed as an argument' ' : > file2 && |