X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset.sh;h=2086d26d343c59d36df79d874d65f58d6d7d8b10;hb=23d61f8343282643c830e1c446962b213dbcc09a;hp=04c1ac0fd2e9e147f89b92cdd831572d53bcfb88;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-reset.sh b/git-reset.sh
index 04c1ac0f..2086d26d 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 . git-sh-setup || die "Not a git archive"
 
+usage () {
+	die 'Usage: git reset [--mixed | --soft | --hard]  [<commit-ish>]'
+}
+
 tmp=/var/tmp/reset.$$
 trap 'rm -f $tmp-*' 0 1 2 3 15
 
@@ -10,6 +14,8 @@ case "$1" in
 	reset_type="$1"
 	shift
 	;;
+-*)
+        usage ;;
 esac
 
 rev=$(git-rev-parse --verify --default HEAD "$@") || exit
@@ -60,7 +66,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 +87,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