git-unfuck

git-unfuck.sh

#!/bin/sh

set -e

if ! klist -t 2>/dev/null >&2 ; then
  echo ":; :; kinit --keychain"
  kinit --keychain
fi

branch=$(git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/\* \(.*\)/\1/')
if [ -z "$branch" ]; then
  echo "Could not parse branch" >&2
  exit 1

else
  if [ $branch != "master" ]; then
    echo ":; :; git co master"
    git co master
  fi

  echo ":; :; git fetch origin master"
  git fetch origin master

  echo ":; :; git pull origin master"
  git pull origin master

  if [ $branch != "master" ]; then
    echo ":; :; git co $branch"
    git co $branch

    echo ":; :; git merge --no-ff master"
    git merge --no-ff master
  fi
fi

git-unpoop.sh

#!/bin/sh

set -e

if ! klist -t 2>/dev/null >&2 ; then
  echo ":; :; kinit --keychain"
  kinit --keychain
fi

root=`git rev-parse --show-toplevel`

echo ":; :; git fetch"
git fetch

echo ":; :; git remote prune origin"
git remote prune origin

echo ":; :; git repack -a -d --depth=250 --window=250"
git repack -a -d --depth=250 --window=250