pull submodule to latest version

bin/git-delete-submodule

@@ -2,12 +2,11 @@
 
 submodule=$1
 
-test -z $submodule && echo "submodule required" 1>&2 && exit 1
+test -z "$submodule" && echo "submodule required" 1>&2 && exit 1
 test ! -f .gitmodules && echo ".gitmodules file not found" 1>&2 && exit 2
+NAME="${submodule%/}" # remove tailing /
+check_submodule_existence "$NAME"
 
-NAME=$(echo $submodule | sed 's/\/$//g')
-test -z $(git config --file=.gitmodules submodule.$NAME.url) && echo "submodule not found" 1>&2 && exit 3
-
-git submodule deinit $NAME
-git rm --cached $NAME
-rm -rf .git/modules/$NAME
+git submodule deinit "$NAME"
+git rm --cached "$NAME"
+rm -rf .git/modules/"$NAME"

bin/git-pull-submodule

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+pull_submodule() {
+    git submodule update --remote --recursive "${2:---merge}" "$1"
+}
+
+while [ "$1" != "" ]; do
+    case $1 in
+        -m | --merge )
+            procedure=--merge
+            ;;
+        -c | --checkout )
+            procedure=--checkout
+            ;;
+        -r | --rebase )
+            procedure=--rebase
+            ;;
+        * )
+            submodule="$1"
+            ;;
+    esac
+    shift
+done
+
+if [ "$submodule" == "" ]
+then
+    pull_submodule "" "$procedure" # update all submodules
+else
+    submodule="${submodule%/}" # remove tailing /
+    check_submodule_existence "$submodule"
+    pull_submodule "$submodule" "$procedure"
+fi

helper/git-extra-utility

@@ -5,3 +5,10 @@ git_extra_mktemp() {
     mktemp -t "$(basename "$0")".XXX
 }
 
+check_submodule_existence() {
+    if test -z "$(git config --file=.gitmodules submodule."$1".url)"
+    then
+        echo "submodule $1 not found" 1>&2
+        exit 3
+    fi
+}

man/git-pull-submodule.1

@@ -0,0 +1,58 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "GIT\-PULL\-SUBMODULE" "1" "June 2015" "" ""
+.
+.SH "NAME"
+\fBgit\-pull\-submodule\fR \- Pull submodules
+.
+.SH "SYNOPSIS"
+\fBgit\-pull\-submodule\fR [OPTIONS] [<path>]
+.
+.SH "DESCRIPTION"
+Pull submodule to latest version
+.
+.SH "OPTIONS"
+<path>
+.
+.P
+The path of the submodule to pull\. If no path is given, all submodules will be pulled\.
+.
+.P
+\-m, \-\-merge
+.
+.P
+Merge the submodule\. It is the default one if no option is given\.
+.
+.P
+\-c, \-\-checkout
+.
+.P
+Checkout the submodule\.
+.
+.P
+\-r, \-\-rebase
+.
+.P
+Rebase the submodule\.
+.
+.SH "EXAMPLES"
+.
+.nf
+
+# checkout latest version of lib/abc
+$ git pull\-submodule \-\-checkout lib/abc
+
+# merge latest version of lib/abc
+$ git pull\-submodule lib/abc
+.
+.fi
+.
+.SH "AUTHOR"
+Written by spacewander <\fIspacewanderlzx@gmail\.com\fR>
+.
+.SH "REPORTING BUGS"
+<\fIhttps://github\.com/tj/git\-extras/issues\fR>
+.
+.SH "SEE ALSO"
+<\fIhttps://github\.com/tj/git\-extras\fR>

man/git-pull-submodule.md

@@ -0,0 +1,49 @@
+git-pull-submodule(1) -- Pull submodules
+============================================
+
+## SYNOPSIS
+
+`git-pull-submodule` [OPTIONS] [<path>]
+
+## DESCRIPTION
+
+Pull submodule to latest version
+
+## OPTIONS
+
+  <path>
+
+  The path of the submodule to pull. If no path is given, all submodules will be pulled.
+
+  -m, --merge
+
+  Merge the submodule. It is the default one if no option is given.
+
+  -c, --checkout
+
+  Checkout the submodule.
+
+  -r, --rebase
+
+  Rebase the submodule.
+
+## EXAMPLES
+
+    # checkout latest version of lib/abc
+    $ git pull-submodule --checkout lib/abc 
+
+    # merge latest version of lib/abc
+    $ git pull-submodule lib/abc
+
+## AUTHOR
+
+Written by spacewander &lt;<[email protected]>&gt;
+
+## REPORTING BUGS
+
+&lt;<https://github.com/tj/git-extras/issues>&gt;
+
+## SEE ALSO
+
+&lt;<https://github.com/tj/git-extras>&gt;
+