X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-reset-script;h=49994df7a2329a87a65588be94088198d208ba1a;hb=0d62fb5672c7b6e3fc6c5418d61ff39bf6034741;hp=b6476edc30b9e8f7c991ebd9e25b530ec49b8253;hpb=6b7242aa1acc3c7835f80522914ffc4b2e789a29;p=git.git

diff --git a/git-reset-script b/git-reset-script
index b6476edc..49994df7 100755
--- a/git-reset-script
+++ b/git-reset-script
@@ -2,6 +2,12 @@
 . git-sh-setup-script || die "Not a git archive"
 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" && echo "$rev" > "$GIT_DIR/HEAD"
+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"