rm: fix bug in recursive subdirectory removal

peff · gitster · commit 3fc0d131c573 · 2010-02-18T22:22:22.000-08:00
If we remove a path in a/deep/subdirectory, we should try to
remove as many trailing components as possible (i.e.,
subdirectory, then deep, then a). However, the test for the
return value of rmdir was reversed, so we only ever deleted
at most one level.

The fix is in remove_path, so "apply" and "merge-recursive"
also are fixed.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/dir.c b/dir.c
@@ -864,7 +864,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
`@@ -864,7 +864,7 @@ int remove_path(const char *name)`
`864`	`864`	`slash = dirs + (slash - name);`
`865`	`865`	`do {`
`866`	`866`	`*slash = '\0';`
`867`		`- } while (rmdir(dirs) && (slash = strrchr(dirs, '/')));`
	`867`	`+ } while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));`
`868`	`868`	`free(dirs);`
`869`	`869`	`}`
`870`	`870`	`return 0;`