guilt-repair

   1 #!/bin/sh
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2008
   4 #
   5
   6 USAGE="[-f]"
   7 . `dirname $0`/guilt
   8
   9 safety_abort()
  10 {
  11         die "Please read the man page first. (you need to specify -f to force the repair)."
  12 }
  13
  14 case $# in
  15         0)
  16                 safety_abort
  17                 ;;
  18         1)
  19                 [ "$1" != "-f" ] && safety_abort
  20                 ;;
  21         *)
  22                 usage
  23                 ;;
  24 esac
  25
  26 oldrev=`git show-ref -s "refs/heads/$branch"`
  27 echo "Current  HEAD commit $oldrev"
  28
  29 if [ -s "$applied" ]; then
  30         # there were some patches applied
  31         newrev=`git rev-parse refs/patches/$branch/$(head -1 < "$applied")^`
  32 else
  33         # no patches were applied, but let's do all the work anyway
  34         newrev="$oldrev"
  35 fi
  36
  37 echo "New      HEAD commit $newrev"
  38
  39 echo -n "Are you sure you want to proceed? [y/N] "
  40 read n
  41 if [ "$n" != "y" ] && [ "$n" != "Y" ]; then
  42         die "Aborting..."
  43 fi
  44
  45 # blow away any commits
  46 git reset --hard "$newrev" > /dev/null
  47
  48 # blow away the applied stack
  49 remove_patch_refs < "$applied"
  50 printf "" > "$applied"
  51
  52 # update the top/bottom/base tags
  53 update_stack_tags
  54
  55 echo "Done."