git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Jens.Lehmann@web.de, apenwarr@gmail.com,
	jrnieder@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCHv3 3/7] submodule update: narrow scope of local variable
Date: Thu, 28 Jul 2016 17:44:05 -0700	[thread overview]
Message-ID: <20160729004409.2072-4-sbeller@google.com> (raw)
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


  parent reply	other threads:[~2016-07-29  0:44 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-29  0:44 [PATCHv3 0/7] submodule update: allow '.' for branch value Stefan Beller
2016-07-29  0:44 ` [PATCHv3 1/7] t7406: future proof tests with hard coded depth Stefan Beller
2016-07-29  0:44 ` [PATCHv3 2/7] submodule update: respect depth in subsequent fetches Stefan Beller
2016-07-29  0:44 ` Stefan Beller [this message]
2016-07-29  0:44 ` [PATCHv3 4/7] submodule--helper: fix usage string for relative-path Stefan Beller
2016-07-29  0:44 ` [PATCHv3 5/7] submodule-config: keep configured branch around Stefan Beller
2016-07-29  0:44 ` [PATCHv3 6/7] submodule--helper: add remote-branch helper Stefan Beller
2016-08-03 16:25   ` Jeff King
2016-08-03 20:11     ` Stefan Beller
2016-08-03 20:15       ` Jeff King
2016-07-29  0:44 ` [PATCHv3 7/7] submodule update: allow '.' for branch value Stefan Beller
2016-08-01 21:48 ` [PATCHv3 0/7] " Junio C Hamano

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=20160729004409.2072-4-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=Jens.Lehmann@web.de \
    --cc=apenwarr@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.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).