Merge branch 'jk/maint-rmdir-fix' into maint

gitster · gitster · commit 7c0be4da5cab · 2010-02-19T01:31:37.000-08:00
* jk/maint-rmdir-fix:
  rm: fix bug in recursive subdirectory removal
diff --git a/dir.c b/dir.c
@@ -1044,7 +1044,7 @@ int remove_path(const char *name)
 		slash = dirs + (slash - name);
 		do {
 			*slash = '\0';
-		} while (rmdir(dirs) && (slash = strrchr(dirs, '/')));
+		} while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));
 		free(dirs);
 	}
 	return 0;
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
@@ -271,4 +271,12 @@ test_expect_success 'choking "git rm" should not let it die with cruft' '
 	test "$status" != 0
 '
 
+test_expect_success 'rm removes subdirectories recursively' '
+	mkdir -p dir/subdir/subsubdir &&
+	echo content >dir/subdir/subsubdir/file &&
+	git add dir/subdir/subsubdir/file &&
+	git rm -f dir/subdir/subsubdir/file &&
+	! test -d dir
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -1044,7 +1044,7 @@ int remove_path(const char *name)`
`1044`	`1044`	`slash = dirs + (slash - name);`
`1045`	`1045`	`do {`
`1046`	`1046`	`*slash = '\0';`
`1047`		`- } while (rmdir(dirs) && (slash = strrchr(dirs, '/')));`
	`1047`	`+ } while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));`
`1048`	`1048`	`free(dirs);`
`1049`	`1049`	`}`
`1050`	`1050`	`return 0;`