Merge branch 'dw/subtree-split-do-not-drop-merge' into maint

diff --git a/sha1_file.c b/sha1_file.c
index a54deb0558f0809e0ee98d96c9b4e1797b698fd0..73ccd49a465b1cf8b668edf8c13ea75d6b8de718 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3505,12 +3505,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;
 }