Sync origin

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.rb]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

git-addremove

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 git add -A
-git ls-files --deleted -z | while read file; do
+git ls-files --deleted -z | while read -r file; do
     git rm "$file"
 done

git-addsub

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script makes it much easier to add new submodules
 
@@ -12,7 +12,7 @@ for dir in "$@"; do
     SUBDIR=$(abspath "$dir")
     SUBDIR=$(echo $SUBDIR | sed s/$PROJ_RE//)
 
-    repo=$(echo $(grep "url = " "$dir/.git/config") | \
+    repo=$(grep "url = " "$dir/.git/config" | \
         sed 's/.*url = //' | \
         sed 's/git@github.com:\([^\/]*\)\//git:\/\/github.com\/\1\//' )
 

git-addtree

@@ -1,2 +1,2 @@
-#!/bin/bash
-git subtree add --prefix $1 ext/$(basename $1) master --squash
+#!/usr/bin/env bash
+git subtree add --prefix "$1" "ext/$(basename "$1")" master --squash

git-all-commits

@@ -1,15 +1,15 @@
 #!/bin/sh
 
 find .git/objects -type f | \
-while read file; do
-    if echo $file | egrep -q '\.idx$'; then
-        git show-index < $file | awk '{print $2}'
-    elif echo $file | egrep -q '[0-9a-f]{38}$'; then
-        echo $(basename $(dirname $file))$(basename $file)
+while read -r file; do
+    if echo "$file" | grep -Eq '\.idx$'; then
+        git show-index < "$file" | awk '{print $2}'
+    elif echo "$file" | grep -Eq '[0-9a-f]{38}$'; then
+        echo "$(basename "$(dirname "$file")")$(basename "$file")"
     fi
 done | \
-while read hash; do
-    if [ "$(git cat-file -t $hash)" = commit ]; then
-        echo $hash
+while read -r hash; do
+    if [ "$(git cat-file -t "$hash")" = commit ]; then
+        echo "$hash"
     fi
 done

git-all-objects

@@ -1,15 +1,15 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 shopt -s nullglob extglob
 
-cd "`git rev-parse --git-path objects`"
+cd "$(git rev-parse --git-path objects)"
 
 # packed objects
 for p in pack/pack-*([0-9a-f]).idx ; do
-    git show-index < $p | cut -f 2 -d ' '
+    git show-index < "$p" | cut -f 2 -d ' '
 done
 
 # loose objects
 for o in [0-9a-f][0-9a-f]/*([0-9a-f]) ; do
-    echo ${o/\/}
+    echo "${o/\/}"
 done

git-already-merged

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# From https://railsware.com/blog/git-housekeeping-tutorial-clean-up-outdated-branches-in-local-and-remote-repositories/
+
+for branch in $(git branch -r --merged | grep -v HEAD)
+do
+    printf '%s\t%s\n' "$(git show --format="%ci %cr %an" "$branch" | head -n 1)" "$branch"
+done | sort -r

git-amend-all

@@ -6,15 +6,15 @@
 ## This is free software, and you are welcome to redistribute it
 ## under certain conditions; see COPYING for details.
 
-# Purpose: This script adds all modified and deleted files, 
+# Purpose: This script adds all modified and deleted files,
 # except the new files and adds it to the recent commit by amending it
 
 set -e
 
 # User is not in git repository
 if ! git branch > /dev/null 2>&1
 then
-	echo "E: '$(basename ${PWD})' - Not a Git repository."
+	echo "E: '$(basename "${PWD}")' - Not a Git repository."
 	exit 1
 fi
 

git-apply-url

@@ -31,21 +31,21 @@
 
 URL=$1
 
-function error {
-  echo $*
+error() {
+  echo "$*"
   exit 1
 }
 
-if [[ ! $URL ]]; then
-  error $0 URL
+if [ ! "$URL" ]; then
+  error "usage: $0 URL"
 fi
 
-if [[ -x $(which curl) && $(curl -V | grep https) ]]; then
+if command -v curl >/dev/null 2>&1 && curl -V | grep -q https >/dev/null 2>&1; then
   fetch="curl -s"
-elif [[ -x $(which wget) ]]; then
+elif command -v wget >/dev/null 2>&1; then
   fetch="wget -O - -q --no-check-certificate"
 else
   error need curl or wget
 fi
 
-$fetch $URL | patch -p1
+$fetch "$URL" | patch -p1

git-archive-all

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Super basic tool to export repo and all submodules
 # as a single zip file

git-branch-done

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# git branch-done <branch>
+
+# destination branch as parameter - depends on merge strategy, typically master
+DST_BRANCH=""
+if [ -n "$1" ]; then
+    DST_BRANCH="$1"
+else
+	echo "Usage: git branch-done <branch>"
+	exit 1
+fi
+
+# get  current branch - typically topic branch like taskXXXX, bugXXXX, ...
+cb=$(git rev-parse --abbrev-ref HEAD)
+# no fast forward merge from current branch to destination branch
+git checkout "$DST_BRANCH" && git merge --no-ff "$cb" && git branch -d "$cb"

git-branch-status-subtree/.gitignore

@@ -0,0 +1,5 @@
+*
+!gbs-config.sh.inc.example
+!git-branch-status
+!LICENSE
+!README.md

git-branch-status-subtree/README.md

@@ -58,16 +58,16 @@ EXAMPLES:
     | feature-branch | (even)     | (ahead 2) | origin/feature-branch |
     | master         | (behind 1) | (even)    | origin/master         |
 
-  # compare two arbitrary branches (either local and either remote)
+  # compare two arbitrary branches - local or remote
   $ git-branch-status local-arbitrary-branch fork/arbitrary-branch
     | local-arbitrary-branch | (even)     | (ahead 1) | fork/arbitrary-branch  |
   $ git-branch-status fork/arbitrary-branch local-arbitrary-branch
     | fork/arbitrary-branch  | (behind 1) | (even)    | local-arbitrary-branch |
 
-  # show all branches - including those synchronized, non-tracking, or not checked-out
+  # show all branches - local and remote, regardless of state or relationship
   $ git-branch-status -a
   $ git-branch-status --all
-    | master         | (even)     | (ahead 1) | origin/master             |
+   *| master         | (even)     | (ahead 1) | origin/master             |
     | tracked-branch | (even)     | (even)    | origin/tracked-branch     |
     | (no local)     | n/a        | n/a       | origin/untracked-branch   |
     | local-branch   | n/a        | n/a       | (no upstream)             |
@@ -77,7 +77,7 @@ EXAMPLES:
   # show the current branch
   $ git-branch-status -b
   $ git-branch-status --branch
-    | current-branch | (even) | (ahead 2) | origin/current-branch |
+   *| current-branch | (even) | (ahead 2) | origin/current-branch |
 
   # show a specific branch
   $ git-branch-status          specific-branch
@@ -98,7 +98,7 @@ EXAMPLES:
   # show all local branches - including those synchronized or non-tracking
   $ git-branch-status -l
   $ git-branch-status --local
-    | master         | (even)     | (ahead 1) | origin/master         |
+   *| master         | (even)     | (ahead 1) | origin/master         |
     | tracked-branch | (even)     | (even)    | origin/tracked-branch |
     | local-branch   | n/a        | n/a       | (no upstream)         |
 
@@ -111,9 +111,9 @@ EXAMPLES:
   # show all branches with timestamps (like -a -d)
   $ git-branch-status -v
   $ git-branch-status --verbose
-    | 1999-12-31 local   | n/a        | n/a    | (no upstream)             |
-    | 1999-12-31 master  | (behind 1) | (even) | 2000-01-01 origin/master  |
-    | 1999-12-31 tracked | (even)     | (even) | 2000-01-01 origin/tracked |
+    | 1999-12-31 master    | (behind 1) | (even) | 2000-01-01 origin/master  |
+    | 1999-12-31 tracked   | (even)     | (even) | 2000-01-01 origin/tracked |
+   *| 1999-12-31 local-wip | n/a        | n/a    | (no upstream)             |
 ```
 
 

git-branch-status-subtree/gbs-config.sh.inc.example

@@ -0,0 +1,28 @@
+###############################################################################
+#  optional user-defined config for the 'git-branch-status' program           #
+#-----------------------------------------------------------------------------#
+#  * copy this file to: ./gbs-config.sh.inc (or $GBS_CFG_FILE) to customize   #
+#  * the text in this file must be valid BASH                                 #
+#  * you can also export these configuration options from the environment     #
+#      as well as an alternate location of this file (as $GBS_CFG_FILE)       #
+#  * environment variables will over-ride those defined in this file          #
+#  * environment variables should be named similarly to those in this file    #
+#      with the CFG_* prefix replaced with GBS_*                              #
+#      eg: export GBS_CFG_FILE=~/.config/git-branch-status/config.sh.inc      #
+#      eg: export GBS_FETCH_PERIOD=0                                          #
+###############################################################################
+
+
+# number of minutes between automatic `git fetch --all` calls
+#   0 => always, -1 => never (default: -1)
+readonly CFG_FETCH_PERIOD=-1
+
+
+# writable filesystem location for storage of the last-fetch timestamp
+#   (default: ~/.GBS_LAST_FETCH)
+readonly CFG_LAST_FETCH_FILE=~/.GBS_LAST_FETCH
+
+
+# whether or not to present ANSI colors
+#   0 => no, 1 => yes (default: 1)
+readonly CFG_USE_ANSI_COLOR=1