git-reset.sh

   1 #!/bin/sh
   2
   3 USAGE='[--mixed | --soft | --hard]  [<commit-ish>]'
   4 . git-sh-setup
   5
   6 update=
   7 reset_type=--mixed
   8 case "$1" in
   9 --mixed | --soft | --hard)
  10         reset_type="$1"
  11         shift
  12         ;;
  13 -*)
  14         usage ;;
  15 esac
  16
  17 case $# in
  18 0) rev=HEAD ;;
  19 1) rev=$(git-rev-parse --verify "$1") || exit ;;
  20 *) usage ;;
  21 esac
  22 rev=$(git-rev-parse --verify $rev^0) || exit
  23
  24 # We need to remember the set of paths that _could_ be left
  25 # behind before a hard reset, so that we can remove them.
  26 if test "$reset_type" = "--hard"
  27 then
  28         update=-u
  29 fi
  30
  31 # Soft reset does not touch the index file nor the working tree
  32 # at all, but requires them in a good order.  Other resets reset
  33 # the index file to the tree object we are switching to.
  34 if test "$reset_type" = "--soft"
  35 then
  36         if test -f "$GIT_DIR/MERGE_HEAD" ||
  37            test "" != "$(git-ls-files --unmerged)"
  38         then
  39                 die "Cannot do a soft reset in the middle of a merge."
  40         fi
  41 else
  42         git-read-tree --reset $update "$rev" || exit
  43 fi
  44
  45 # Any resets update HEAD to the head being switched to.
  46 if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
  47 then
  48         echo "$orig" >"$GIT_DIR/ORIG_HEAD"
  49 else
  50         rm -f "$GIT_DIR/ORIG_HEAD"
  51 fi
  52 git-update-ref -m "reset $reset_type $*" HEAD "$rev"
  53 update_ref_status=$?
  54
  55 case "$reset_type" in
  56 --hard )
  57         ;; # Nothing else to do
  58 --soft )
  59         ;; # Nothing else to do
  60 --mixed )
  61         # Report what has not been updated.
  62         git-update-index --refresh
  63         ;;
  64 esac
  65
  66 rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" \
  67         "$GIT_DIR/SQUASH_MSG" "$GIT_DIR/MERGE_MSG"
  68
  69 exit $update_ref_status