projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/git-svn: better documenting of CLI switches
[git.git]
/
git-reset.sh
diff --git
a/git-reset.sh
b/git-reset.sh
index
dfa9cb8
..
6cb073c
100755
(executable)
--- a/
git-reset.sh
+++ b/
git-reset.sh
@@
-1,7
+1,9
@@
#!/bin/sh
#!/bin/sh
-. git-sh-setup || die "Not a git archive"
-tmp=/var/tmp/reset.$$
+USAGE='[--mixed | --soft | --hard] [<commit-ish>]'
+. git-sh-setup
+
+tmp=${GIT_DIR}/reset.$$
trap 'rm -f $tmp-*' 0 1 2 3 15
reset_type=--mixed
trap 'rm -f $tmp-*' 0 1 2 3 15
reset_type=--mixed
@@
-10,6
+12,8
@@
case "$1" in
reset_type="$1"
shift
;;
reset_type="$1"
shift
;;
+-*)
+ usage ;;
esac
rev=$(git-rev-parse --verify --default HEAD "$@") || exit
esac
rev=$(git-rev-parse --verify --default HEAD "$@") || exit
@@
-60,7
+64,7
@@
then
else
rm -f "$GIT_DIR/ORIG_HEAD"
fi
else
rm -f "$GIT_DIR/ORIG_HEAD"
fi
-
echo "$rev" >"$GIT_DIR/HEAD
"
+
git-update-ref HEAD "$rev
"
case "$reset_type" in
--hard )
case "$reset_type" in
--hard )
@@
-84,6
+88,9
@@
case "$reset_type" in
# it is ok if this fails -- it may already
# have been culled by checkout-index.
unlink $_;
# it is ok if this fails -- it may already
# have been culled by checkout-index.
unlink $_;
+ while (s|/[^/]*$||) {
+ rmdir($_) or last;
+ }
}
}
' $tmp-exists
}
}
' $tmp-exists
@@
-96,4
+103,4
@@
case "$reset_type" in
;;
esac
;;
esac
-rm -f "$GIT_DIR/MERGE_HEAD"
+rm -f "$GIT_DIR/MERGE_HEAD"
"$GIT_DIR/rr-cache/MERGE_RR"