X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset-script;h=49994df7a2329a87a65588be94088198d208ba1a;hb=c35a7b8d806317dc1762e36561cbd31c2530dd9c;hp=0c02aa6423ec485e19bd7439c926addbb8fd029d;hpb=b33e9666082ce692e64ccfd688dc2a5075566f75;p=git.git

diff --git a/git-reset-script b/git-reset-script
index 0c02aa64..49994df7 100755
--- a/git-reset-script
+++ b/git-reset-script
@@ -1,5 +1,13 @@
 #!/bin/sh
 . git-sh-setup-script || die "Not a git archive"
-git-read-tree --reset HEAD
+rev=$(git-rev-parse --revs-only --verify --default HEAD "$@") || exit
+rev=$(git-rev-parse --revs-only --verify $rev^0) || exit
+git-read-tree --reset "$rev" && {
+	if orig=$(git-rev-parse --verify HEAD 2>/dev/null)
+	then
+		echo "$orig" >"$GIT_DIR/ORIG_HEAD"
+	fi
+	echo "$rev" > "$GIT_DIR/HEAD"
+}
 git-update-cache --refresh
 rm -f "$GIT_DIR/MERGE_HEAD"