From: Jeff King <peff@peff.net>
Date: Sun, 4 Nov 2012 13:00:16 +0000 (-0500)
Subject: Merge branch 'sz/maint-submodule-reference-arg'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17771447811cee1740810f2d60eb8c31d8b967c9;p=git.git

Merge branch 'sz/maint-submodule-reference-arg'

* sz/maint-submodule-reference-arg:
  submodule add: fix handling of --reference=<repo> option
---

17771447811cee1740810f2d60eb8c31d8b967c9
diff --cc git-submodule.sh
index 9e1e1f441,dcceb43d7..3d1617fa9
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -270,13 -270,7 +270,12 @@@ cmd_add(
  			;;
  		--reference=*)
  			reference="$1"
- 			shift
  			;;
 +		--name)
 +			case "$2" in '') usage ;; esac
 +			custom_name=$2
 +			shift
 +			;;
  		--)
  			shift
  			break