[PATCH v2 4/4] clone --dissociate: avoid locking pack files
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Oct 5, 2015, 20:33 UTC
- Message-ID
- <73315ceddd3ee6aa7d1c2f01bd1b64441b42ad22.1444076827.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1444076827.git.johannes.schindelin@gmx.de>
When `git clone` is asked to dissociate the repository from the reference repository whose objects were used, it is quite possible that the pack files need to be repacked. In that case, the pack files need to be deleted that were originally hard-links to the reference repository's pack files.
On platforms where a file cannot be deleted if another process still holds a handle on it, we therefore need to take pains to release all pack files and indexes before dissociating.
This fixes https://github.com/git-for-windows/git/issues/446
The test case to demonstrate the breakage technically does not need to be run on Linux or MacOSX. It won't hurt, either, though.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- builtin/clone.c | 4 +++- t/t5700-clone-reference.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index 578da85..cc896e2 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1064,8 +1064,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix) transport_unlock_pack(transport); transport_disconnect(transport); - if (option_dissociate) + if (option_dissociate) { + close_all_packs(); dissociate_from_references(); + } junk_mode = JUNK_LEAVE_REPO; err = checkout(); diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh index f7cec85..2250ef4 100755 --- a/t/t5700-clone-reference.sh +++ b/t/t5700-clone-reference.sh @@ -188,7 +188,7 @@ test_expect_success 'clone and dissociate from reference' ' test_must_fail git -C R fsck && git -C S fsck ' -test_expect_failure MINGW 'clone, dissociate from partial reference and repack' ' +test_expect_success 'clone, dissociate from partial reference and repack' ' rm -fr P Q R && git init P && (
-- 2.5.3.windows.1.3.gc322723