From: Jens Lehmann <Jens.Lehmann@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Heiko Voigt <hvoigt@hvoigt.net>,
git@vger.kernel.org, Manlio Perillo <manlio.perillo@gmail.com>,
"W. Trevor King" <wking@drexel.edu>
Subject: Re: [BUG] git submodule update is not fail safe
Date: Sat, 05 Jan 2013 15:01:08 +0100 [thread overview]
Message-ID: <50E83224.2070701@web.de> (raw)
In-Reply-To: <7vzk0osjli.fsf@alter.siamese.dyndns.org>
Am 04.01.2013 22:51, schrieb Junio C Hamano:
> Manlio Perillo <manlio.perillo@gmail.com> writes:
>
>> $ git submodule update --init
>> ...
>> Submodule 'roms/vgabios' (git://git.qemu.org/vgabios.git/) registered
>> for path 'roms/vgabios'
>> fatal: unable to connect to anongit.freedesktop.org:
>> anongit.freedesktop.org[0: 131.252.210.161]: errno=Connection timed out
>>
>> Unable to fetch in submodule path 'pixman'
>>
>> $ git submodule update --init
>> fatal: Needed a single revision
>> Unable to find current revision in submodule path 'pixman'
>>
>> The problem is easy to solve: manually remove the pixman directory;
>> however IMHO git submodule update should not fail this way since it may
>> confuse the user.
>
> Sounds like a reasonable observation. Jens, Heiko, comments?
The reason seems to be that clone leaves a partial initialized .git
directory in case of connection problems. The next time submodule
update runs it tries to revive the submodule from .git/modules/<name>
but fails as there are no objects in it.
This looks like a bug in clone to me, as it takes precautions to clean
up if something goes wrong but doesn't do that in this case. But while
glancing over the code I didn't find out what goes wrong here.
If this isn't seen as a bug in clone, we could also remove the
.git/modules/<name> directory in module_clone() of git-submodule.s
h when the clone fails. Manilo, does the following patch remove the
problems you are seeing (after removing .git/modules/pixman manually)?
diff --git a/git-submodule.sh b/git-submodule.sh
index 2365149..4098702 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -208,7 +208,10 @@ module_clone()
git clone $quiet -n ${reference:+"$reference"} \
--separate-git-dir "$gitdir" "$url" "$sm_path"
) ||
- die "$(eval_gettext "Clone of '\$url' into submodule path '\$sm_path' failed")"
+ (
+ rm -rf "$gitdir" &&
+ die "$(eval_gettext "Clone of '\$url' into submodule path '\$sm_path' failed")"
+ )
fi
# We already are at the root of the work tree but cd_to_toplevel will
next prev parent reply other threads:[~2013-01-05 14:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-04 20:53 [BUG] git submodule update is not fail safe Manlio Perillo
2013-01-04 21:51 ` Junio C Hamano
2013-01-05 13:52 ` Manlio Perillo
2013-01-05 14:07 ` Jens Lehmann
2013-01-05 14:01 ` Jens Lehmann [this message]
2013-01-05 14:49 ` Manlio Perillo
2013-01-05 14:50 ` Jens Lehmann
2013-01-05 20:17 ` [PATCH] clone: support atomic operation with --separate-git-dir Jens Lehmann
2013-01-05 21:20 ` Manlio Perillo
2013-01-06 6:43 ` Junio C Hamano
2013-01-06 8:49 ` Duy Nguyen
2013-01-06 9:16 ` Jonathan Nieder
2013-01-06 9:47 ` [PATCH] clone: forbid --bare --separate-git-dir <dir> Nguyễn Thái Ngọc Duy
2013-01-06 10:19 ` Jonathan Nieder
2013-01-06 23:13 ` Junio C Hamano
2013-01-07 1:18 ` Duy Nguyen
2013-01-07 2:04 ` Junio C Hamano
2013-01-08 14:16 ` Duy Nguyen
2013-01-08 17:15 ` Jens Lehmann
2013-01-08 17:45 ` Junio C Hamano
2013-01-08 23:34 ` Duy Nguyen
2013-01-08 23:42 ` Junio C Hamano
2013-01-11 3:09 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2013-01-11 3:15 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50E83224.2070701@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=manlio.perillo@gmail.com \
--cc=wking@drexel.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).