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

[PATCHv3 3/7] submodule update: narrow scope of local variable

From
Stefan Beller <sbeller@google.com>
Date
Jul 29, 2016, 00:44 UTC
Message-ID
<20160729004409.2072-4-sbeller@google.com>
In-Reply-To
<20160729004409.2072-1-sbeller@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
 git-submodule.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 174f4ea..0d4021f 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -591,7 +591,6 @@ cmd_update()
 
 		name=$(git submodule--helper name "$sm_path") || exit
 		url=$(git config submodule."$name".url)
-		branch=$(get_submodule_config "$name" branch master)
 		if ! test -z "$update"
 		then
 			update_module=$update
@@ -617,6 +616,7 @@ cmd_update()
 
 		if test -n "$remote"
 		then
+			branch=$(get_submodule_config "$name" branch master)
 			if test -z "$nofetch"
 			then
 				# Fetch remote before determining tracking $sha1
-- 
2.9.2.472.g1ffb07c.dirty
Previous: Stefan BellerNext: Stefan Beller
Message 6 of 12 in “[PATCHv3 0/7] submodule update: allow '.' for branch value”
  1. Stefan BellerJul 29, 2016
  2. 1/7 t7406: future proof tests with hard coded depthStefan Beller, Jul 29, 2016
  3. 2/7 submodule update: respect depth in subsequent fetchesStefan Beller, Jul 29, 2016
  4. 4/7 submodule--helper: fix usage string for relative-pathStefan Beller, Jul 29, 2016
  5. 5/7 submodule-config: keep configured branch aroundStefan Beller, Jul 29, 2016
  6. 3/7 submodule update: narrow scope of local variableStefan Beller, Jul 29, 2016
  7. 7/7 submodule update: allow '.' for branch valueStefan Beller, Jul 29, 2016
  8. 6/7 submodule--helper: add remote-branch helperStefan Beller, Jul 29, 2016
  9. Jeff KingAug 3, 2016
  10. Stefan BellerAug 3, 2016
  11. Jeff KingAug 3, 2016
  12. Junio C HamanoAug 1, 2016

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.