From: Lars Hjemli <hjemli@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 2/5] git-submodule: remember to checkout after clone
Date: Mon, 11 Jun 2007 21:12:22 +0200 [thread overview]
Message-ID: <1181589146478-git-send-email-hjemli@gmail.com> (raw)
In-Reply-To: <11815891451258-git-send-email-hjemli@gmail.com>
After the initial clone of a submodule, no files would be checked out in
the submodule directory if the submodule HEAD was equal to the SHA-1
specified in the index of the containing repository. This fixes the problem
by simply ignoring submodule HEAD for a fresh clone.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
git-submodule.sh | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 8bdd99a..4a6d64d 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -100,12 +100,13 @@ modules_update()
if ! test -d "$path"/.git
then
module_clone "$path" "$url" || exit
+ subsha1=
+ else
+ subsha1=$(unset GIT_DIR && cd "$path" &&
+ git-rev-parse --verify HEAD) ||
+ die "Unable to find current revision of submodule '$path'"
fi
- subsha1=$(unset GIT_DIR && cd "$path" &&
- git-rev-parse --verify HEAD) ||
- die "Unable to find current revision of submodule '$path'"
-
if test "$subsha1" != "$sha1"
then
(unset GIT_DIR && cd "$path" && git-fetch &&
--
1.5.2.1.914.gbd3a7
next prev parent reply other threads:[~2007-06-11 19:10 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-11 19:12 [PATCH 0/5] misc. submodule related changes Lars Hjemli
2007-06-11 19:12 ` [PATCH 1/5] t7400: barf if git-submodule removes or replaces a file Lars Hjemli
2007-06-11 19:12 ` Lars Hjemli [this message]
2007-06-11 19:12 ` [PATCH 3/5] Rename sections from "module" to "submodule" in .gitmodules Lars Hjemli
2007-06-11 19:12 ` [PATCH 4/5] git-submodule: give submodules proper names Lars Hjemli
2007-06-11 19:12 ` [PATCH 5/5] Add gitmodules(5) Lars Hjemli
2007-06-11 22:59 ` Frank Lichtenheld
2007-06-12 7:05 ` Lars Hjemli
2007-06-12 8:04 ` Sven Verdoolaege
2007-06-12 8:27 ` Lars Hjemli
2007-06-12 9:45 ` Josef Weidendorfer
2007-06-12 10:23 ` Lars Hjemli
2007-06-12 12:05 ` Josef Weidendorfer
2007-06-12 9:49 ` Sven Verdoolaege
2007-06-12 10:28 ` Lars Hjemli
2007-06-12 10:34 ` Johannes Sixt
2007-06-12 10:48 ` Johannes Sixt
[not found] ` <8c5c35580706120352y24e53a10sf339147b22f1286e@mail.gmail.com>
2007-06-12 10:54 ` Lars Hjemli
2007-06-12 11:03 ` Johannes Sixt
2007-06-12 11:12 ` Lars Hjemli
2007-06-12 12:23 ` Josef Weidendorfer
2007-06-12 12:37 ` Lars Hjemli
2007-06-12 12:41 ` Johannes Sixt
2007-06-12 13:40 ` Josef Weidendorfer
2007-06-12 13:50 ` Josef Weidendorfer
2007-06-12 19:03 ` Junio C Hamano
2007-06-12 19:10 ` Sven Verdoolaege
2007-06-12 21:33 ` Josef Weidendorfer
-- strict thread matches above, loose matches on Subject: below --
2007-06-11 0:01 [PATCH 2/5] git-submodule: remember to checkout after clone Lars Hjemli
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=1181589146478-git-send-email-hjemli@gmail.com \
--to=hjemli@gmail.com \
--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).