git-todos

#!/bin/bash -e

ack_args=$@
git_ref=$( git which-master )
pattern='TODO|NOTE|XXX|placehold\.it|TK|tbd|console\.log'

function committed_files {
  git diff ${git_ref}..HEAD --diff-filter=ACMX -G"$pattern" --name-only
}

function uncommitted_files {
  git ls-files -mo --exclude-standard
}

( committed_files ; uncommitted_files ) \
  | sort -u \
  | xargs ack --with-filename $ack_args "$pattern"

git-which-master

#!/bin/bash
# Outputs "origin/master" if origin/master is a valid branch and ahead of
# master, otherwise outputs "master" if master if a valid branch, otherwise
# outputs nothing.

if git show-ref --verify --quiet refs/remotes/origin/master; then
  commits_ahead=$( git rev-list master..origin/master | wc -l )
  if [ "$commits_ahead" -gt 0 ]; then
    echo 'origin/master'
    exit 0
  fi
fi

if git show-ref --verify --quiet refs/heads/master; then
  echo 'master'
  exit 0
fi

exit 1