From: Ping Yin <pkufranky@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Ping Yin <pkufranky@gmail.com>
Subject: [PATCH 6/7] git-submodule: "update --force" to enforce cloning non-submodule
Date: Wed, 16 Apr 2008 22:19:36 +0800 [thread overview]
Message-ID: <1208355577-8734-7-git-send-email-pkufranky@gmail.com> (raw)
In-Reply-To: <1208355577-8734-6-git-send-email-pkufranky@gmail.com>
If the update subcommand combines with --force, instead of
issuing a "Not a submodule" warning for non-submodules, non-submodules
(i.e. modules existing in .gitmodules or $GIT_DIR/config but not added
to the super module) will also be cloned and the master branch will be
checked out.
However, if a non-submodule has already been cloned before, the update
will be rejected since we don't know what the update means.
Signed-off-by: Ping Yin <pkufranky@gmail.com>
---
git-submodule.sh | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 87d84fa..ed6f698 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -361,6 +361,9 @@ cmd_update()
-q|--quiet)
quiet=1
;;
+ -f | --force)
+ force="$1"
+ ;;
--)
shift
break
@@ -381,7 +384,8 @@ cmd_update()
test -n "$name" || exit
if test $sha1 = 0000000000000000000000000000000000000000
then
- say "Not a submodule: $name @ $path"
+ test -z "$force" &&
+ say "Not a submodule: $name @ $path" &&
continue
elif test -z "$url"
then
@@ -395,8 +399,15 @@ cmd_update()
if ! test -d "$path"/.git
then
module_clone "$path" "$url" || exit
+ test "$sha1" = 0000000000000000000000000000000000000000 &&
+ (unset GIT_DIR; cd "$path" && git checkout -q master) &&
+ say "non-submodule cloned and master checked out: $name @ $path" &&
+ continue
subsha1=
else
+ test "$sha1" = 0000000000000000000000000000000000000000 &&
+ say "non-submodule already cloned: $name @ $path" &&
+ continue
subsha1=$(unset GIT_DIR; cd "$path" &&
git rev-parse --verify HEAD) ||
die "Unable to find current revision in submodule path '$path'"
--
1.5.5.70.gd68a
next prev parent reply other threads:[~2008-04-16 14:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-16 14:19 [PATCH 0/7] submodule: fallback to .gitmodules and multiple level module definition Ping Yin
2008-04-16 14:19 ` [PATCH 1/7] git-submodule: Extract functions module_info and module_url Ping Yin
2008-04-16 14:19 ` [PATCH 2/7] git-submodule: Extract absolute_url & move absolute url logic to module_clone Ping Yin
2008-04-16 14:19 ` [PATCH 3/7] git-submodule: Fall back on .gitmodules if info not found in $GIT_DIR/config Ping Yin
2008-04-16 14:19 ` [PATCH 4/7] git-submodule: Extract module_add from cmd_add Ping Yin
2008-04-16 14:19 ` [PATCH 5/7] git-submodule: multi-level module definition Ping Yin
2008-04-16 14:19 ` Ping Yin [this message]
2008-04-16 14:19 ` [PATCH 7/7] git-submodule: Don't die when command fails for one submodule Ping Yin
2008-04-22 6:10 ` [PATCH 2/7] git-submodule: Extract absolute_url & move absolute url logic to module_clone Junio C Hamano
2008-04-22 6:50 ` Ping Yin
2008-04-22 7:57 ` Junio C Hamano
2008-04-22 9:09 ` Ping Yin
2008-04-22 14:38 ` Ping Yin
2008-04-22 14:41 ` Ping Yin
[not found] ` <alpine.DEB.1.00.0804221609200.4460@eeepc-johanness>
2008-04-22 16:54 ` Ping Yin
2008-04-22 17:13 ` Jakub Narebski
2008-04-22 17:20 ` Ping Yin
2008-04-22 7:00 ` Ping Yin
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=1208355577-8734-7-git-send-email-pkufranky@gmail.com \
--to=pkufranky@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.
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).