X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-reset.sh;h=1dc606fbd3fd29f5f4c9928a2518df46109ef449;hb=689b4d552b8108d2c92c63258990ecd2bc791739;hp=36fc8ce25b39682ba256a8d39bf9a393907ef43d;hpb=e6a4e5816e0b521713e899cafa60b0dd6bc74eec;p=git.git diff --git a/git-reset.sh b/git-reset.sh index 36fc8ce25..1dc606fbd 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -1,31 +1,60 @@ #!/bin/sh - -USAGE='[--mixed | --soft | --hard] []' +# +# Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano +# +USAGE='[--mixed | --soft | --hard] [] [ [--] ...]' +SUBDIRECTORY_OK=Yes . git-sh-setup +set_reflog_action "reset $*" +require_work_tree -tmp=${GIT_DIR}/reset.$$ -trap 'rm -f $tmp-*' 0 1 2 3 15 +update= reset_type=--mixed +unset rev -update= -reset_type=--mixed -case "$1" in ---mixed | --soft | --hard) - reset_type="$1" +while case $# in 0) break ;; esac +do + case "$1" in + --mixed | --soft | --hard) + reset_type="$1" + ;; + --) + break + ;; + -*) + usage + ;; + *) + rev=$(git rev-parse --verify "$1") || exit + shift + break + ;; + esac shift - ;; --*) - usage ;; -esac +done -case $# in -0) rev=HEAD ;; -1) rev=$(git-rev-parse --verify "$1") || exit ;; -*) usage ;; -esac -rev=$(git-rev-parse --verify $rev^0) || exit +: ${rev=HEAD} +rev=$(git rev-parse --verify $rev^0) || exit + +# Skip -- in "git reset HEAD -- foo" and "git reset -- foo". +case "$1" in --) shift ;; esac + +# git reset --mixed tree [--] paths... can be used to +# load chosen paths from the tree into the index without +# affecting the working tree nor HEAD. +if test $# != 0 +then + test "$reset_type" = "--mixed" || + die "Cannot do partial $reset_type reset." + + git diff-index --cached $rev -- "$@" | + 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/' | + git update-index --add --remove --index-info || exit + git update-index --refresh + exit +fi + +cd_to_toplevel -# We need to remember the set of paths that _could_ be left -# behind before a hard reset, so that we can remove them. if test "$reset_type" = "--hard" then update=-u @@ -37,35 +66,41 @@ fi if test "$reset_type" = "--soft" then if test -f "$GIT_DIR/MERGE_HEAD" || - test "" != "$(git-ls-files --unmerged)" + test "" != "$(git ls-files --unmerged)" then die "Cannot do a soft reset in the middle of a merge." fi else - git-read-tree --reset $update "$rev" || exit + git read-tree -v --reset $update "$rev" || exit fi # Any resets update HEAD to the head being switched to. -if orig=$(git-rev-parse --verify HEAD 2>/dev/null) +if orig=$(git rev-parse --verify HEAD 2>/dev/null) then echo "$orig" >"$GIT_DIR/ORIG_HEAD" else rm -f "$GIT_DIR/ORIG_HEAD" fi -git-update-ref -m "reset $reset_type $*" HEAD "$rev" +git update-ref -m "$GIT_REFLOG_ACTION" HEAD "$rev" update_ref_status=$? case "$reset_type" in --hard ) - ;; # Nothing else to do + test $update_ref_status = 0 && { + printf "HEAD is now at " + GIT_PAGER= git log --max-count=1 --pretty=oneline \ + --abbrev-commit HEAD + } + ;; --soft ) ;; # Nothing else to do --mixed ) # Report what has not been updated. - git-update-index --refresh + git update-index --refresh ;; esac -rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG" +rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" \ + "$GIT_DIR/SQUASH_MSG" "$GIT_DIR/MERGE_MSG" exit $update_ref_status