git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 5/7] git-submodule: Extract module_add from cmd_add

From
Ping Yin <pkufranky@gmail.com>
Date
Mar 13, 2008, 17:56 UTC
Message-ID
<1205431001-18590-6-git-send-email-pkufranky@gmail.com>
In-Reply-To
<1205431001-18590-5-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 bd2934a..dacd99a 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.4.4.653.g7cf1e
Previous: Ping YinNext: Ping Yin
Message 6 of 10 in “git-submodule enhancements”
  1. 0/7 git-submodule enhancementsPing Yin, Mar 13, 2008
  2. 1/7 git-submodule: Avoid 'fatal: cannot describe' messagePing Yin, Mar 13, 2008
  3. 2/7 git-submodule: Extract functions module_info and module_urlPing Yin, Mar 13, 2008
  4. 3/7 git-submodule: Extract absolute_url & move absolute url logic to module_clonePing Yin, Mar 13, 2008
  5. 4/7 git-submodule: Fall back on .gitmodules if info not found in $GIT_DIR/configPing Yin, Mar 13, 2008
  6. 5/7 git-submodule: Extract module_add from cmd_addPing Yin, Mar 13, 2008
  7. 6/7 git-submodule: multi-level module definitionPing Yin, Mar 13, 2008
  8. 7/7 git-submodule: Don't die when command fails for one submodulePing Yin, Mar 13, 2008
  9. Ping YinMar 14, 2008
  10. Ping YinMar 13, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.