@matheusbsbs / matheus-bagliano / commits / 019683025f
Fork 0

fast-import: delay creating leading directories for export-marks

When we parse the --export-marks option, we don't immediately open the file, but we do create any leading directories. This can be especially confusing when a command-line option overrides an in-stream one, in which case we'd create the leading directory for the in-stream file, even though we never actually write the file. Let's instead create the directories just before opening the file, which means we'll create only useful directories. Note that this could change the handling of relative paths if we chdir() in between, but we don't actually do so; the only permanent chdir is from setup_git_directory() which runs before either code path (potentially we should take the pre-setup dir into account to avoid surprising the user, but that's an orthogonal change). The test just adapts the existing "override" test to use paths with leading directories. This checks both that the correct directory is created (which worked before but was not tested), and that the overridden one is not (our new fix here). While we're here, let's also check the error result of safe_create_leading_directories(). We'd presumably notice any failure immediately after when we try to open the file itself, but we can give a more specific error message in this case. Signed-off-by: Jeff King <peff@peff.net>

Jeff King committed Aug 29, 2019 at 13:33 UTC 019683025f1b14d7cb671312ab01f7330e9b33e7
2 files changed +17 -3
fast-import.c
+6 -1
@@ -1861,6 +1861,12 @@ static void dump_marks(void)
1861 if (!export_marks_file || (import_marks_file && !import_marks_file_done))
1862 return;
1863
1864 + if (safe_create_leading_directories_const(export_marks_file)) {
1865 + failure |= error_errno("unable to create leading directories of %s",
1866 + export_marks_file);
1867 + return;
1868 + }
1869 +
1870 if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) {
1871 failure |= error_errno("Unable to write marks file %s",
1872 export_marks_file);
@@ -3268,7 +3274,6 @@ static void option_active_branches(const char *branches)
3274 static void option_export_marks(const char *marks)
3275 {
3276 export_marks_file = make_fast_import_path(marks);
3271 - safe_create_leading_directories_const(export_marks_file);
3277 }
3278
3279 static void option_cat_blob_fd(const char *fd)
t/t9300-fast-import.sh
+11 -2
@@ -2132,8 +2132,17 @@ test_expect_success 'R: export-marks feature results in a marks file being creat
2132 '
2133
2134 test_expect_success 'R: export-marks options can be overridden by commandline options' '
2135 - git fast-import --export-marks=other.marks <input &&
2136 - grep :1 other.marks
2135 + cat >input <<-\EOF &&
2136 + feature export-marks=feature-sub/git.marks
2137 + blob
2138 + mark :1
2139 + data 3
2140 + hi
2141 +
2142 + EOF
2143 + git fast-import --export-marks=cmdline-sub/other.marks <input &&
2144 + grep :1 cmdline-sub/other.marks &&
2145 + test_path_is_missing feature-sub
2146 '
2147
2148 test_expect_success 'R: catch typo in marks file name' '