New, even smarter git-slurp version

 *  Add --force-* options to skipt .git-slurp-ok file checks.

 *  Allow passing path to slurp.

    You can slurp only a particular sub-tree.

 *  Improve commit message.

    Host has been dropped, and slurped paths are logged (as relative
    to worktree root).

dotfiles/gittum/bin/slurp

@@ -4,23 +4,22 @@
 # Slurp - add everything, slurp into a WIP commit and push
 #
 
-die() {
+warn() {
     echo "$@" >&2
+}
+
+die() {
+    warn "$@"
     exit 2
 }
 
-mkmsg() {
-    #
-    # Create the slurp message
-    #
-    local host=$(hostname)
-    local date=$(date -Isec)
-    echo "WIP slurp, $date at $host"
+usage() {
+    die "usage: git slurp [--force-slurp] [--force-push] [pathspec]..."
 }
 
-allowed_anything() {
+allowed_slurp() {
     #
-    # Is anything allowed in this repo?
+    # Is slurp allowed in this repo?
     #
     test -f "$ok_file"
 }
@@ -29,26 +28,72 @@ allowed_push() {
     #
     # Is push allowed in this repo?
     #
-    grep -qxF PUSH "$ok_file"
+    grep -qxF PUSH "$ok_file" 2>/dev/null
 }
 
-main() {
-    local git_root
-    local ok_file
-    local want_push=false
+git_relative() {
+    #
+    # Convert pathspec $1 to git-root-based pathspec
+    #
+    # Also try to clean up path a bit; i.e. remove double slashes
+    # or unnecessary trailing dot.
+    #
+    local path="$1"
+    test -n "$GIT_PREFIX" && path="$GIT_PREFIX/$path"
+    local full=$(readlink -m "$path")
+    printf %s "${full#$git_root/}"
+}
 
-    git_root="$(git rev-parse --show-toplevel)" || die
-    ok_file="$git_root/.git-slurp-ok"
+slurp1() {
+    #
+    # Slurp pathspec $1
+    #
+    local rel_pathspec      # relative to git root
+    rel_pathspec=$(git_relative "$1")
+    git add "$rel_pathspec"                         || die
+    git commit -m "WIP slurp, $date: $rel_pathspec" || die
+}
 
-    allowed_anything || die "you don't want this."
-    allowed_push     && want_push=true
+go_slurp() {
+    #
+    # Do the slurp for pathspecs $@
+    #
+    $force_slurp || allowed_slurp || die "you don't want this."
+    local date=$(date -Isec)
+    local pathspec
+    for pathspec in "$@";
+    do
+        slurp1 "$pathspec"
+    done
+}
 
-    git add .
-    git commit -m "$(mkmsg)"
-    if $want_push;
+go_push() {
+    #
+    # Do the push (if allowed)
+    #
+    if $force_push || allowed_push;
     then
         git push
     fi
 }
 
-main
+main() {
+    local git_root
+    local ok_file
+    local force_slurp=false
+    local force_push=false
+    while true; do case $1 in
+        --force-slurp)  force_slurp=true; shift ;;
+        --force-push)   force_push=true;  shift ;;
+        --)             shift; break ;;
+        -*)             usage ;;
+        *)              break ;;
+    esac done
+    test -n "$1" || set -- .
+    git_root="$(git rev-parse --show-toplevel)" || die
+    ok_file="$git_root/.git-slurp-ok"
+    go_slurp "$@"
+    go_push
+}
+
+main "$@"