41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 9d09df88970ab91a08de15f0b2f9ab9b77ffd2cd Mon Sep 17 00:00:00 2001
|
|
From: Jeff King <peff@peff.net>
|
|
Date: Thu, 29 Aug 2019 13:07:04 -0400
|
|
Subject: [PATCH 04/30] fast-import: stop creating leading directories for
|
|
import-marks
|
|
|
|
When asked to import marks from "subdir/file.marks", we create the
|
|
leading directory "subdir" if it doesn't exist. This makes no sense for
|
|
importing marks, where we only ever open the path for reading.
|
|
|
|
Most of the time this would be a noop, since if the marks file exists,
|
|
then the leading directories exist, too. But if it doesn't (e.g.,
|
|
because --import-marks-if-exists was used), then we'd create the useless
|
|
directory.
|
|
|
|
This dates back to 580d5f83e7 (fast-import: always create marks_file
|
|
directories, 2010-03-29). Even then it was useless, so it seems to have
|
|
been added in error alongside the --export-marks case (which _is_
|
|
helpful).
|
|
|
|
Signed-off-by: Jeff King <peff@peff.net>
|
|
---
|
|
fast-import.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/fast-import.c b/fast-import.c
|
|
index 30b9479a75..b05d560d0a 100644
|
|
--- a/fast-import.c
|
|
+++ b/fast-import.c
|
|
@@ -3198,7 +3198,6 @@ static void option_import_marks(const char *marks,
|
|
}
|
|
|
|
import_marks_file = make_fast_import_path(marks);
|
|
- safe_create_leading_directories_const(import_marks_file);
|
|
import_marks_file_from_stream = from_stream;
|
|
import_marks_file_ignore_missing = ignore_missing;
|
|
}
|
|
--
|
|
2.17.1
|
|
|