X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-reset-script;h=7da8d86823b09a6fa9a5c5d28dcc849253843181;hb=da27f4f3f4c23d0276a372726ed050ed13e45168;hp=eaefd00d9d1e8adddb56040af0156d209815cc89;hpb=40d8cfe4117564e5520e8f4f953addaa94844476;p=git.git

diff --git a/git-reset-script b/git-reset-script
index eaefd00d..7da8d868 100755
--- a/git-reset-script
+++ b/git-reset-script
@@ -1,3 +1,13 @@
 #!/bin/sh
-git-read-tree --reset HEAD
+. git-sh-setup-script || die "Not a git archive"
+rev=$(git-rev-parse --verify --default HEAD "$@") || exit
+rev=$(git-rev-parse --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"