Skip to content

Commit cf87a5a

Browse files
Vampiretnyblom
authored andcommitted
Correctly clean out replaced paths when --empty-dirs is used and the path_from is empty
1 parent a84ea29 commit cf87a5a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/svn.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -919,16 +919,17 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change2_t *ch
919919
}
920920
}
921921

922+
if (ignoreSet == false) {
923+
txn->deleteFile(path);
924+
}
925+
922926
// Add GitIgnore for empty directories (if GitIgnore was not set previously)
923927
if (CommandLineParser::instance()->contains("empty-dirs") && ignoreSet == false) {
924928
if (addGitIgnore(pool, key, path, fs_root, txn) == EXIT_SUCCESS) {
925929
return EXIT_SUCCESS;
926930
}
927931
}
928932

929-
if (ignoreSet == false) {
930-
txn->deleteFile(path);
931-
}
932933
recursiveDumpDir(txn, fs, fs_root, key, path, pool, revnum, rule, matchRules, ruledebug);
933934
}
934935

0 commit comments

Comments
 (0)