Merge branch 'issue-231'

This branch hopefully addresses #231 where `git repack` could not delete the object directory because there was still an open handle on it. Signed-off-by: Johannes Schindelin <[email protected]>
git-for-windows · Aug 17, 2015 · 10ca1f7 · 10ca1f7
2 parents 156b212 + 96febf9
commit 10ca1f7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sha1_file.c b/sha1_file.c
@@ -3473,12 +3473,12 @@ static int for_each_file_in_obj_subdir(int subdir_nr,
 				break;
 		}
 	}
-	strbuf_setlen(path, baselen);
+	closedir(dir);
 
+	strbuf_setlen(path, baselen);
 	if (!r && subdir_cb)
 		r = subdir_cb(subdir_nr, path->buf, data);
 
-	closedir(dir);
 	return r;
 }