Andrew's git - gitweb.git/blob

   1#!/bin/sh
   2#
   3# Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano
   4#
   5USAGE='[--mixed | --soft | --hard]  [<commit-ish>] [ [--] <paths>...]'
   6SUBDIRECTORY_OK=Yes
   7. git-sh-setup
   8set_reflog_action "reset $*"
   9require_work_tree
  10
  11update= reset_type=--mixed
  12unset rev
  13
  14while case $# in 0) break ;; esac
  15do
  16        case "$1" in
  17        --mixed | --soft | --hard)
  18                reset_type="$1"
  19                ;;
  20        --)
  21                break
  22                ;;
  23        -*)
  24                usage
  25                ;;
  26        *)
  27                rev=$(git-rev-parse --verify "$1") || exit
  28                shift
  29                break
  30                ;;
  31        esac
  32        shift
  33done
  34
  35: ${rev=HEAD}
  36rev=$(git-rev-parse --verify $rev^0) || exit
  37
  38# Skip -- in "git reset HEAD -- foo" and "git reset -- foo".
  39case "$1" in --) shift ;; esac
  40
  41# git reset --mixed tree [--] paths... can be used to
  42# load chosen paths from the tree into the index without
  43# affecting the working tree nor HEAD.
  44if test $# != 0
  45then
  46        test "$reset_type" = "--mixed" ||
  47                die "Cannot do partial $reset_type reset."
  48
  49        git-diff-index --cached $rev -- "$@" |
  50        sed -e 's/^:\([0-7][0-7]*\) [0-7][0-7]* \([0-9a-f][0-9a-f]*\) [0-9a-f][0-9a-f]* [A-Z]   \(.*\)$/\1 \2   \3/' |
  51        git update-index --add --remove --index-info || exit
  52        git update-index --refresh
  53        exit
  54fi
  55
  56cd_to_toplevel
  57
  58if test "$reset_type" = "--hard"
  59then
  60        update=-u
  61fi
  62
  63# Soft reset does not touch the index file nor the working tree
  64# at all, but requires them in a good order.  Other resets reset
  65# the index file to the tree object we are switching to.
  66if test "$reset_type" = "--soft"
  67then
  68        if test -f "$GIT_DIR/MERGE_HEAD" ||
  69           test "" != "$(git-ls-files --unmerged)"
  70        then
  71                die "Cannot do a soft reset in the middle of a merge."
  72        fi
  73else
  74        git-read-tree --reset $update "$rev" || exit
  75fi
  76
  77# Any resets update HEAD to the head being switched to.
  78if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
  79then
  80        echo "$orig" >"$GIT_DIR/ORIG_HEAD"
  81else
  82        rm -f "$GIT_DIR/ORIG_HEAD"
  83fi
  84git-update-ref -m "$GIT_REFLOG_ACTION" HEAD "$rev"
  85update_ref_status=$?
  86
  87case "$reset_type" in
  88--hard )
  89        test $update_ref_status = 0 && {
  90                printf "HEAD is now at "
  91                GIT_PAGER= git log --max-count=1 --pretty=oneline \
  92                        --abbrev-commit HEAD
  93        }
  94        ;;
  95--soft )
  96        ;; # Nothing else to do
  97--mixed )
  98        # Report what has not been updated.
  99        git-update-index --refresh
 100        ;;
 101esac
 102
 103rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" \
 104        "$GIT_DIR/SQUASH_MSG" "$GIT_DIR/MERGE_MSG"
 105
 106exit $update_ref_status