From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 8/9] clone: die on errors from unpack_trees
Date: Mon, 25 Mar 2013 16:23:59 -0400 [thread overview]
Message-ID: <20130325202359.GH16019@sigill.intra.peff.net> (raw)
In-Reply-To: <20130325201427.GA15798@sigill.intra.peff.net>
When clone is populating the working tree, it ignores the
return status from unpack_trees; this means we may report a
successful clone, even when the checkout fails.
When checkout fails, we may want to leave the $GIT_DIR in
place, as it might be possible to recover the data through
further use of "git checkout" (e.g., if the checkout failed
due to a transient error, disk full, etc). However, we
already die on a number of other checkout-related errors, so
this patch follows that pattern.
In addition to marking a now-passing test, we need to adjust
t5710, which blindly assumed it could make bogus clones of
very deep alternates hierarchies. By using "--bare", we can
avoid it actually touching any objects.
Signed-off-by: Jeff King <peff@peff.net>
---
I think the "leave the data behind" fix may be to just set "junk_pid =
0" a little sooner in cmd_clone (i.e., before checkout()). Then we
would still die, but at least leave the fetched objects intact.
builtin/clone.c | 3 ++-
t/t1060-object-corruption.sh | 2 +-
t/t5710-info-alternate.sh | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index e0aaf13..7d48ef3 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -579,7 +579,8 @@ static int checkout(void)
tree = parse_tree_indirect(sha1);
parse_tree(tree);
init_tree_desc(&t, tree->buffer, tree->size);
- unpack_trees(1, &t, &opts);
+ if (unpack_trees(1, &t, &opts) < 0)
+ die(_("unable to checkout working tree"));
if (write_cache(fd, active_cache, active_nr) ||
commit_locked_index(lock_file))
diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh
index eb285c0..05ba4e7 100755
--- a/t/t1060-object-corruption.sh
+++ b/t/t1060-object-corruption.sh
@@ -89,7 +89,7 @@ test_expect_success 'clone --local detects corruption' '
test_must_fail git clone --local bit-error corrupt-checkout
'
-test_expect_failure 'clone --local detects missing objects' '
+test_expect_success 'clone --local detects missing objects' '
test_must_fail git clone --local missing missing-checkout
'
diff --git a/t/t5710-info-alternate.sh b/t/t5710-info-alternate.sh
index aa04529..5a6e49d 100755
--- a/t/t5710-info-alternate.sh
+++ b/t/t5710-info-alternate.sh
@@ -58,7 +58,7 @@ git clone -l -s F G &&
git clone -l -s D E &&
git clone -l -s E F &&
git clone -l -s F G &&
-git clone -l -s G H'
+git clone --bare -l -s G H'
test_expect_success 'invalidity of deepest repository' \
'cd H && {
--
1.8.2.13.g0f18d3c
next prev parent reply other threads:[~2013-03-25 20:24 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-24 18:31 propagating repo corruption across clone Jeff King
2013-03-24 19:01 ` Ævar Arnfjörð Bjarmason
2013-03-24 19:23 ` Jeff King
2013-03-25 13:43 ` Jeff Mitchell
2013-03-25 14:56 ` Jeff King
2013-03-25 15:31 ` Duy Nguyen
2013-03-25 15:56 ` Jeff King
2013-03-25 16:32 ` Jeff Mitchell
2013-03-25 20:07 ` Jeff King
2013-03-26 13:43 ` Jeff Mitchell
2013-03-26 16:55 ` Jeff King
2013-03-26 21:59 ` Philip Oakley
2013-03-26 22:03 ` Jeff King
2013-03-26 23:20 ` Rich Fromm
2013-03-27 1:25 ` Jonathan Nieder
2013-03-27 18:23 ` Rich Fromm
2013-03-27 19:49 ` Jeff King
2013-03-27 20:04 ` Jeff King
2013-03-27 3:47 ` Junio C Hamano
2013-03-27 6:19 ` Sitaram Chamarty
2013-03-27 15:03 ` Junio C Hamano
2013-03-27 15:47 ` Sitaram Chamarty
2013-03-27 18:51 ` Rich Fromm
2013-03-27 19:13 ` Junio C Hamano
2013-03-28 13:52 ` Jeff Mitchell
2013-03-28 13:48 ` Jeff Mitchell
2013-03-26 1:06 ` Duy Nguyen
2013-03-24 19:16 ` Ilari Liusvaara
2013-03-25 20:01 ` Junio C Hamano
2013-03-25 20:05 ` Jeff King
2013-03-25 20:14 ` [PATCH 0/9] corrupt object potpourri Jeff King
2013-03-25 20:16 ` [PATCH 1/9] stream_blob_to_fd: detect errors reading from stream Jeff King
2013-03-26 21:27 ` Junio C Hamano
2013-03-25 20:17 ` [PATCH 2/9] check_sha1_signature: check return value from read_istream Jeff King
2013-03-25 20:18 ` [PATCH 3/9] read_istream_filtered: propagate read error from upstream Jeff King
2013-03-25 20:21 ` [PATCH 4/9] avoid infinite loop in read_istream_loose Jeff King
2013-03-25 20:21 ` [PATCH 5/9] add test for streaming corrupt blobs Jeff King
2013-03-25 21:10 ` Jonathan Nieder
2013-03-25 21:26 ` Jeff King
2013-03-27 20:27 ` Jeff King
2013-03-27 20:35 ` Junio C Hamano
2013-03-25 20:22 ` [PATCH 6/9] streaming_write_entry: propagate streaming errors Jeff King
2013-03-25 21:35 ` Eric Sunshine
2013-03-25 21:37 ` Jeff King
2013-03-25 21:39 ` Jonathan Nieder
2013-03-25 21:49 ` [PATCH v2 " Jeff King
2013-03-25 23:29 ` Jonathan Nieder
2013-03-26 21:38 ` Junio C Hamano
2013-03-25 20:22 ` [PATCH 7/9] add tests for cloning corrupted repositories Jeff King
2013-03-25 20:23 ` Jeff King [this message]
2013-03-26 21:40 ` [PATCH 8/9] clone: die on errors from unpack_trees Junio C Hamano
2013-03-26 22:22 ` [PATCH 10/9] clone: leave repo in place after checkout errors Jeff King
2013-03-26 22:32 ` Jonathan Nieder
2013-03-27 1:03 ` Jeff King
2013-03-25 20:26 ` [PATCH 9/9] clone: run check_everything_connected Jeff King
2013-03-26 0:53 ` Duy Nguyen
2013-03-26 22:24 ` Jeff King
2013-03-26 21:50 ` Junio C Hamano
2013-03-28 0:40 ` Duy Nguyen
2013-03-31 7:57 ` 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=20130325202359.GH16019@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).