2.36 fast-export regression fix
e900d494dc (diff: add an API for deferred freeing, 2021-02-11) added a way to allow reusing diffopts: the no_free bit. 244c27242f (diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec), 2022-02-16) made that mechanism mandatory. git fast-export doesn't set no_free, so path limiting stopped working after the first commit. Set the flag and add a basic test to make sure only changes to the specified files are exported. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Apr 30, 2022 at 16:31 UTC
d1c25272f5c5f78ae302f07ea0b5832c601e373b
2 files changed
+8
builtin/fast-export.c
+1
@@ -1261,6 +1261,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
1261
revs.diffopt.format_callback = show_filemodify;
1262
revs.diffopt.format_callback_data = &paths_of_changed_objects;
1263
revs.diffopt.flags.recursive = 1;
1264
+ revs.diffopt.no_free = 1;
1265
while ((commit = get_revision(&revs)))
1266
handle_commit(commit, &revs, &paths_of_changed_objects);
1267
t/t9350-fast-export.sh
+7
@@ -500,6 +500,13 @@ test_expect_success 'path limiting with import-marks does not lose unmodified fi
500
grep file0 actual
501
'
502
503
+test_expect_success 'path limiting works' '
504
+ git fast-export simple -- file >actual &&
505
+ sed -ne "s/^M .* //p" <actual | sort -u >actual.files &&
506
+ echo file >expect &&
507
+ test_cmp expect actual.files
508
+'
509
+
510
test_expect_success 'avoid corrupt stream with non-existent mark' '
511
test_create_repo avoid_non_existent_mark &&
512
(