2 . git-sh-setup || die "Not a git archive"
5 die 'Usage: git reset [--mixed | --soft | --hard] [<commit-ish>]'
9 trap 'rm -f $tmp-*' 0 1 2 3 15
13 --mixed | --soft | --hard)
21 rev=$(git-rev-parse --verify --default HEAD "$@") || exit
22 rev=$(git-rev-parse --verify $rev^0) || exit
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"
29 git-ls-files --stage -z
30 git-rev-parse --verify HEAD 2>/dev/null &&
31 git-ls-tree -r -z HEAD
38 my ($info, $path) = split(/\t/, $_);
39 next if ($info =~ / tree /);
48 # Soft reset does not touch the index file nor the working tree
49 # at all, but requires them in a good order. Other resets reset
50 # the index file to the tree object we are switching to.
51 if test "$reset_type" = "--soft"
53 if test -f "$GIT_DIR/MERGE_HEAD" ||
54 test "" != "$(git-ls-files --unmerged)"
56 die "Cannot do a soft reset in the middle of a merge."
59 git-read-tree --reset "$rev" || exit
62 # Any resets update HEAD to the head being switched to.
63 if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
65 echo "$orig" >"$GIT_DIR/ORIG_HEAD"
67 rm -f "$GIT_DIR/ORIG_HEAD"
69 git-update-ref HEAD "$rev"
73 # Hard reset matches the working tree to that of the tree
75 git-checkout-index -f -u -q -a
76 git-ls-files --cached -z |
85 open $fh, "<", $ARGV[0]
86 or die "cannot open $ARGV[0]";
89 if (! exists $keep{$_}) {
90 # it is ok if this fails -- it may already
91 # have been culled by checkout-index.
98 ;; # Nothing else to do
100 # Report what has not been updated.
101 git-update-index --refresh
105 rm -f "$GIT_DIR/MERGE_HEAD"