Merge branch 'sz/maint-submodule-reference-arg'
authorJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:00:16 +0000 (08:00 -0500)
committerJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:00:16 +0000 (08:00 -0500)
* sz/maint-submodule-reference-arg:
  submodule add: fix handling of --reference=<repo> option

1  2 
git-submodule.sh

index 9e1e1f44106ca659ee705b4f66dc5cd4997ec907,dcceb43d714ac0829883581de32973d3cb7ca717..3d1617fa9eb490463f9a4a4218082de168e1491a
@@@ -270,13 -270,7 +270,12 @@@ cmd_add(
                        ;;
                --reference=*)
                        reference="$1"
-                       shift
                        ;;
 +              --name)
 +                      case "$2" in '') usage ;; esac
 +                      custom_name=$2
 +                      shift
 +                      ;;
                --)
                        shift
                        break