X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=inline;f=git-reset.sh;h=eb44ee8cc197b7ff11159cf046b790cf693d3a72;hb=7e4a2a848377241b8fb4f624d1151bbf2f8d5814;hp=04c1ac0fd2e9e147f89b92cdd831572d53bcfb88;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-reset.sh b/git-reset.sh
index 04c1ac0f..eb44ee8c 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
-. git-sh-setup || die "Not a git archive"
+
+USAGE='[--mixed | --soft | --hard]  [<commit-ish>]'
+. git-sh-setup
 
 tmp=/var/tmp/reset.$$
 trap 'rm -f $tmp-*' 0 1 2 3 15
@@ -10,6 +12,8 @@ case "$1" in
 	reset_type="$1"
 	shift
 	;;
+-*)
+        usage ;;
 esac
 
 rev=$(git-rev-parse --verify --default HEAD "$@") || exit
@@ -60,7 +64,7 @@ then
 else
 	rm -f "$GIT_DIR/ORIG_HEAD"
 fi
-echo "$rev" >"$GIT_DIR/HEAD"
+git-update-ref HEAD "$rev"
 
 case "$reset_type" in
 --hard )
@@ -81,10 +85,12 @@ case "$reset_type" in
 		while (<$fh>) {
 			chomp;
 			if (! exists $keep{$_}) {
-				print "$_\0";
+				# it is ok if this fails -- it may already
+				# have been culled by checkout-index.
+				unlink $_;
 			}
 		}
-	' $tmp-exists | xargs -0 rm -v -f --
+	' $tmp-exists
 	;;
 --soft )
 	;; # Nothing else to do