git-cvsimport-script: more error handling

[git.git] / git-reset-script

diff --git a/git-reset-script b/git-reset-script
index eaefd00..fe77338 100755 (executable)
--- a/git-reset-script
+++ b/git-reset-script
@@ -1,3 +1,5 @@
 #!/bin/sh
+: ${GIT_DIR=.git}
 git-read-tree --reset HEAD
 git-update-cache --refresh
+rm -f "$GIT_DIR/MERGE_HEAD"