Revise scripts to follow the pattern of "payload as a function"

Author: jimklimov

Diff for: git-branch-alias

@@ -61,10 +61,11 @@
 # expansion "$@" is changed to "$ <at>"), so don't try to use this copy:
 # http://permalink.gmane.org/gmane.comp.version-control.git/247581
 
+git_branch_alias() {
 #cwd=$(git rev-parse --show-toplevel)
 git=$(git rev-parse --git-dir)
 if [ $? -ne 0 ]; then
-    exit 1
+    return 1
 fi
 
 command=$(basename $0)
@@ -129,7 +130,7 @@ if [ -n "${shorthelp}" ]; then
 For help, use: ${command} -h
 
 EOF
-    exit 0
+    return 0
 fi
 
 if [ -n "${help}" ]; then
@@ -169,15 +170,15 @@ this situation by first switching HEAD to <alias>'s target branch
 if HEAD was currently set to <alias>.
 
 EOF
-    exit 0
+    return 0
 fi
 
 # Use the current branch by default.
 if [ -z "${branch}" ]; then
     branch=$(git symbolic-ref -q HEAD)
     if [ $? -ne 0 ]; then
         stderr "Could not establish current HEAD."
-        exit 1
+        return 1
     fi
 fi
 
@@ -191,13 +192,13 @@ symref=${symref##refs/heads/}
 if [ -n "${delete}" ]; then
     if [ ! -f "${git}/refs/heads/${symref}" ]; then
         stderr "Symbolic reference refs/heads/${symref} does not exist."
-        exit 1
+        return 1
     fi
 
     # Verify that it IS a symbolic reference
     if ! git symbolic-ref "refs/heads/${symref}" >/dev/null; then
         stderr "Error validating refs/heads/${symref} as symbolic reference."
-        exit 1
+        return 1
     fi
 
     # If we currently have <symref> checked out, deleting it is bad
@@ -210,7 +211,7 @@ if [ -n "${delete}" ]; then
         branch=$(git symbolic-ref -q HEAD)
         if [ $? -ne 0 ]; then
             stderr "Could not establish current HEAD."
-            exit 1
+            return 1
         fi
         stdout "Switching HEAD to target branch ${branch}"
         # By using git symbolic-ref HEAD to find the target ref
@@ -219,7 +220,7 @@ if [ -n "${delete}" ]; then
         if ! git symbolic-ref HEAD "${branch}"; then
             stderr "Error updating HEAD from ${symref} to ${branch}"
             stderr "Aborting."
-            exit 1
+            return 1
         fi
     fi
 
@@ -229,7 +230,7 @@ if [ -n "${delete}" ]; then
     # the backwards-compatible command.
     stdout "Deleting symbolic reference refs/heads/${symref}"
     git update-ref -d --no-deref "refs/heads/${symref}"
-    exit $?
+    return $?
 fi
 
 # Creating a new symbolic reference.
@@ -239,7 +240,7 @@ fi
 # the wrong way around (treating it like ln -s is a really bad idea).
 if [ ! -f "${git}/refs/heads/${branch}" ]; then
     stderr "Target refs/heads/${branch} does not exist."
-    exit 1
+    return 1
 fi
 if [ -f "${git}/refs/heads/${symref}" ]; then
     target=$(git symbolic-ref "refs/heads/${symref}")
@@ -251,12 +252,12 @@ if [ -f "${git}/refs/heads/${symref}" ]; then
         stderr "File refs/heads/${symref} already exists"
         stderr "(and is not a symbolic reference!)"
     fi
-    exit 1
+    return 1
 fi
 if git show-ref --verify --heads --quiet "refs/heads/${symref}"; then
     # n.b. I'm pretty sure this is unreachable, given the previous block.
     stderr "refs/heads/${symref} is a valid reference without a file!?"
-    exit 1
+    return 1
 fi
 
 # The parameters are good.
@@ -266,6 +267,8 @@ if git symbolic-ref "refs/heads/${symref}" "refs/heads/${branch}"; then
     stdout "  ${symref} -> ${target##refs/heads/}"
 else
     stderr "Failed to create branch alias."
-    exit 1
+    return 1
 fi
+}
 
+git_branch_alias "$@"

Diff for: git-branchkill

@@ -4,6 +4,7 @@
 ### branch and its trackers.
 ### Script Copyright (C) 2015 by Jim Klimov, License: MIT
 
+git_branch_kill() {
 EXEC=""
 LOCALKILL=-d
 REPODIRS=""
@@ -22,7 +23,7 @@ while [ $# -gt 0 ]; do
         echo "          (e.g. from a shell glob or Midnight Commander substitution);"
         echo "          if no '-R ...' is specified, script works in current dir"
         echo "  branch(es)      List one or more branch name(s) to remove"
-        exit 0
+        return 0
         ;;
     -n) EXEC=echo
         echo "Info: Running in read-only mode, no branches should get cut" >&2
@@ -44,22 +45,22 @@ while [ $# -gt 0 ]; do
             shift 2
         else
             echo "Error: Repo dir '$2' specified but not found" >&2
-            exit 1
+            return 1
         fi
         ;;
     *) break ;; # fall through with branch names
     esac
 done
 
-[ $# = 0 ] && echo "Error: branch name(s) required" >&2 && exit 1
+[ $# = 0 ] && echo "Error: branch name(s) required" >&2 && return 1
 
 ### List of failed-to-kill objects:
 ### "[MRL](RESCODE)\tPATH\tBRANCH\tREASON"
 FAILED=""
 
 branchkill() {
-    CURBRANCH="`git branch | egrep '^\* ' | sed 's,^\* ,,'`" || exit
-    [ -n "$CURBRANCH" ] || exit
+    CURBRANCH="`git branch | egrep '^\* ' | sed 's,^\* ,,'`" || return
+    [ -n "$CURBRANCH" ] || return
 
     REMOTES="`git remote -v | egrep 'push' | awk '{print $1}'`" || REMOTES=""
 
@@ -134,4 +135,7 @@ fi
     echo "List of failed items: $FAILED"
     # First line is empty by construction process
 
-exit $RRES
+return $RRES
+}
+
+git_branch_kill "$@"

Diff for: git-merge-um

@@ -15,6 +15,7 @@
 ### depends on "--set-upstream-to" configuration of your branch).
 ### Copyright (C) 2015-2016 by Jim Klimov, License: MIT
 
+do_git_merge_update_master() {
 BASE_REPO=upstream
 BASE_BRANCH=master
 DO_REBASE=no
@@ -48,3 +49,6 @@ fi
 echo ""
 echo "=== Pushing the changes back..."
 git sync
+}
+
+do_git_merge_update_master "$@"

Diff for: git-pull-ff

@@ -12,7 +12,7 @@ LANG=C
 LC_ALL=C
 export PATH LANG LC_ALL
 
-git_pull-ff() {
+git_pull_ff() {
 
 currentbranchref="$(git symbolic-ref HEAD 2>&-)"
 currentbranch="`git branch | grep '^* ' | sed 's,^* ,,'`" || \
@@ -114,5 +114,5 @@ git pull
     mkdir "$repodir/.zfs/snapshot/git-pull-ff--$TS--Z--afterSync" || true
 }
 
-git_pull-ff
+git_pull_ff
 

Diff for: git-sync

@@ -9,6 +9,7 @@
 ### the remote repositories, and so the local sources are most up-to-date.
 ### Copyright (C) 2014-2016 by Jim Klimov, License: MIT
 
+do_git_sync() {
 echo "=== Syncing from repo `pwd` branch `git branch | egrep '^\*' | sed 's,^\* ,,'` to known remotes..."
 for R in "" \
 	`git remote -v | egrep 'push' | awk '{print $1}' | grep -v upstream` \
@@ -21,4 +22,6 @@ done
 
 echo "=== Pulling fast-forward from remotes ..."
 git pull-ff
+}
 
+do_git_sync "$@"