fixup! tmp-objdir: new API for creating temporary writable databases

neerajsi-msft · dscho · commit b83c4e4b0629 · 2021-10-27T14:34:53.000+02:00
Fix prune code to be able to delete multiple object directories. I
wasn't properly resetting the strbuf with the path.

Signed-off-by: Neeraj Singh &lt;neerajsi@microsoft.com&gt;
Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/builtin/prune.c b/builtin/prune.c
@@ -32,6 +32,7 @@ static int prune_tmp_file(const char *fullpath)
 		if (show_only || verbose)
 			printf("Removing stale temporary directory %s\n", fullpath);
 		if (!show_only) {
+			strbuf_reset(&remove_dir_buf);
 			strbuf_addstr(&remove_dir_buf, fullpath);
 			remove_dir_recursively(&remove_dir_buf, 0);
 		}

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ static int prune_tmp_file(const char *fullpath)`
`32`	`32`	`if (show_only \|\| verbose)`
`33`	`33`	`printf("Removing stale temporary directory %s\n", fullpath);`
`34`	`34`	`if (!show_only) {`
	`35`	`+ strbuf_reset(&remove_dir_buf);`
`35`	`36`	`strbuf_addstr(&remove_dir_buf, fullpath);`
`36`	`37`	`remove_dir_recursively(&remove_dir_buf, 0);`
`37`	`38`	`}`