From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 15 Feb 2009 09:44:20 +0000 (-0800)
Subject: Merge branch 'ff/submodule-no-fetch'
X-Git-Tag: v1.6.2-rc1~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b83a9243147a8cec4f556af1d29f2cc21c12518?ds=inline;hp=-c

Merge branch 'ff/submodule-no-fetch'

* ff/submodule-no-fetch:
submodule: add --no-fetch parameter to update command
---

7b83a9243147a8cec4f556af1d29f2cc21c12518
diff --combined git-submodule.sh
index 6cc2d334c0,af8d10ca83..204aab671e
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -5,7 -5,7 +5,7 @@@
  # Copyright (c) 2007 Lars Hjemli
  
  USAGE="[--quiet] [--cached] \
- [add <repo> [-b branch] <path>]|[status|init|update [-i|--init]|summary [-n|--summary-limit <n>] [<commit>]] \
+ [add <repo> [-b branch] <path>]|[status|init|update [-i|--init] [-N|--no-fetch]|summary [-n|--summary-limit <n>] [<commit>]] \
  [--] [<path>...]|[foreach <command>]|[sync [--] [<path>...]]"
  OPTIONS_SPEC=
  . git-sh-setup
@@@ -16,6 -16,7 +16,7 @@@ command
  branch=
  quiet=
  cached=
+ nofetch=
  
  #
  # print stuff on stdout unless -q was specified
@@@ -59,7 -60,7 +60,7 @@@ resolve_relative_url (
  #
  module_list()
  {
 -	git ls-files --stage -- "$@" | grep '^160000 '
 +	git ls-files --error-unmatch --stage -- "$@" | grep '^160000 '
  }
  
  #
@@@ -300,6 -301,10 +301,10 @@@ cmd_update(
  			shift
  			cmd_init "$@" || return
  			;;
+ 		-N|--no-fetch)
+ 			shift
+ 			nofetch=1
+ 			;;
  		--)
  			shift
  			break
@@@ -345,8 -350,16 +350,16 @@@
  			then
  				force="-f"
  			fi
- 			(unset GIT_DIR; cd "$path" && git-fetch &&
- 				git-checkout $force -q "$sha1") ||
+ 
+ 			if test -z "$nofetch"
+ 			then
+ 				(unset GIT_DIR; cd "$path" &&
+ 					git-fetch) ||
+ 				die "Unable to fetch in submodule path '$path'"
+ 			fi
+ 
+ 			(unset GIT_DIR; cd "$path" &&
+ 				  git-checkout $force -q "$sha1") ||
  			die "Unable to checkout '$sha1' in submodule path '$path'"
  
  			say "Submodule path '$path': checked out '$sha1'"