From: Ping Yin <pkufranky@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Ping Yin <pkufranky@gmail.com>
Subject: [PATCH 4/7] git-submodule: Extract module_add from cmd_add
Date: Wed, 16 Apr 2008 22:19:34 +0800 [thread overview]
Message-ID: <1208355577-8734-5-git-send-email-pkufranky@gmail.com> (raw)
In-Reply-To: <1208355577-8734-4-git-send-email-pkufranky@gmail.com>
cmd_add will later handle the case adding multiple modules, so extract
module_add to add a single module.
Signed-off-by: Ping Yin <pkufranky@gmail.com>
---
git-submodule.sh | 67 +++++++++++++++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 2276f6b..f3a1213 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -155,34 +155,7 @@ module_clone()
#
# optional branch is stored in global branch variable
#
-cmd_add()
-{
- # parse $args after "submodule ... add".
- while test $# -ne 0
- do
- case "$1" in
- -b | --branch)
- case "$2" in '') usage ;; esac
- branch=$2
- shift
- ;;
- -q|--quiet)
- quiet=1
- ;;
- --)
- shift
- break
- ;;
- -*)
- usage
- ;;
- *)
- break
- ;;
- esac
- shift
- done
-
+module_add() {
repo=$1
path=$2
@@ -226,6 +199,44 @@ cmd_add()
}
#
+# Add a new submodule to the working tree, .gitmodules and the index
+#
+# $@ = repo [path]
+#
+# optional branch is stored in global branch variable
+#
+cmd_add()
+{
+ # parse $args after "submodule ... add".
+ while test $# -ne 0
+ do
+ case "$1" in
+ -b | --branch)
+ case "$2" in '') usage ;; esac
+ branch=$2
+ shift
+ ;;
+ -q|--quiet)
+ quiet=1
+ ;;
+ --)
+ shift
+ break
+ ;;
+ -*)
+ usage
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+ done
+
+ module_add "$1" "$2"
+}
+
+#
# Register submodules in .git/config
#
# $@ = requested paths (default to all)
--
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 ` Ping Yin [this message]
2008-04-16 14:19 ` [PATCH 5/7] git-submodule: multi-level module definition Ping Yin
2008-04-16 14:19 ` [PATCH 6/7] git-submodule: "update --force" to enforce cloning non-submodule Ping Yin
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-5-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).