From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 1/2] worktree: demonstrate data lost to auto-gc
Date: Wed, 8 Feb 2017 13:17:58 +0100 (CET) [thread overview]
Message-ID: <674c16ee94c7609d82d14cac498ba62e5df65ab1.1486556262.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1486556262.git.johannes.schindelin@gmx.de>
When gc --auto is called in the presence of worktrees, it fails to take
*all* reflogs into account when trying to retain reachable objects, and as
a consequence data integrity goes pretty much to hell.
This patch provides a test case in the hopes that this bug gets fixed,
after an initial attempt has stalled for eight months already.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/t6500-gc.sh | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 1762dfa6a3..e24a4fb611 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -67,5 +67,44 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre
test_line_count = 2 new # There is one new pack and its .idx
'
+trigger_auto_gc () {
+ # This is unfortunately very, very ugly
+ gdir="$(git rev-parse --git-common-dir)" &&
+ mkdir -p "$gdir"/objects/17 &&
+ touch "$gdir"/objects/17/17171717171717171717171717171717171717 &&
+ touch "$gdir"/objects/17/17171717171717171717171717171717171718 &&
+ git -c gc.auto=1 -c gc.pruneexpire=now -c gc.autodetach=0 gc --auto
+}
+
+test_expect_failure 'gc respects refs/reflogs in all worktrees' '
+ test_commit something &&
+ git worktree add worktree &&
+ (
+ cd worktree &&
+ git checkout --detach &&
+ # avoid implicit tagging of test_commit
+ echo 1 >something.t &&
+ test_tick &&
+ git commit -m worktree-reflog something.t &&
+ git rev-parse --verify HEAD >../commit-reflog &&
+ echo 2 >something.t &&
+ test_tick &&
+ git commit -m worktree-ref something.t &&
+ git rev-parse --verify HEAD >../commit-ref
+ ) &&
+ trigger_auto_gc &&
+ git rev-parse --verify $(cat commit-ref)^{commit} &&
+ git rev-parse --verify $(cat commit-reflog)^{commit} &&
+
+ # Now, add a reflog in the top-level dir and verify that `git gc` in
+ # the worktree does not purge that
+ git checkout --detach &&
+ echo 3 >something.t &&
+ test_tick &&
+ git commit -m commondir-reflog something.t &&
+ git rev-parse --verify HEAD >commondir-reflog &&
+ (cd worktree && trigger_auto_gc) &&
+ git rev-parse --verify $(cat commondir-reflog)^{commit}
+'
test_done
--
2.11.1.windows.1
next prev parent reply other threads:[~2017-02-08 12:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 12:17 [PATCH 0/2] Demonstrate a critical worktree/gc bug Johannes Schindelin
2017-02-08 12:17 ` Johannes Schindelin [this message]
2017-02-08 12:18 ` [PATCH 2/2] worktree: demonstrate a half-working workaround for auto-gc Johannes Schindelin
2017-02-08 12:28 ` [PATCH 0/2] Demonstrate a critical worktree/gc bug Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=674c16ee94c7609d82d14cac498ba62e5df65ab1.1486556262.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.