X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset.sh;h=6cb073cb16f8b8d8b923bd0cd77be00da0e169e3;hb=cfa24e184a67cc36f414d913cf705d31e70a7a1a;hp=6c9e58ad9a727ab5091b0de02e089b82cb8331dd;hpb=5df466c507ee2dd81c2e9002c3fedf3536cde0dc;p=git.git

diff --git a/git-reset.sh b/git-reset.sh
index 6c9e58ad..6cb073cb 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -88,6 +88,9 @@ case "$reset_type" in
 				# it is ok if this fails -- it may already
 				# have been culled by checkout-index.
 				unlink $_;
+				while (s|/[^/]*$||) {
+					rmdir($_) or last;
+				}
 			}
 		}
 	' $tmp-exists
@@ -100,4 +103,4 @@ case "$reset_type" in
 	;;
 esac
 
-rm -f "$GIT_DIR/MERGE_HEAD"
+rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR"