Merge branch 'rs/fast-export-pathspec-fix' into maint

gitster · gitster · commit 09a2302c70a2 · 2022-05-05T14:36:25.000-07:00
"git fast-export -- &lt;pathspec&gt;" lost the pathspec when showing the
second and subsequent commits, which has been corrected.
source: &lt;2c988c7b-0efe-4222-4a43-8124fe1a9da6@web.de&gt;

* rs/fast-export-pathspec-fix:
  2.36 fast-export regression fix
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
@@ -1261,6 +1261,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 	revs.diffopt.format_callback = show_filemodify;
 	revs.diffopt.format_callback_data = &paths_of_changed_objects;
 	revs.diffopt.flags.recursive = 1;
+	revs.diffopt.no_free = 1;
 	while ((commit = get_revision(&revs)))
 		handle_commit(commit, &revs, &paths_of_changed_objects);
 
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
@@ -500,6 +500,13 @@ test_expect_success 'path limiting with import-marks does not lose unmodified fi
 	grep file0 actual
 '
 
+test_expect_success 'path limiting works' '
+	git fast-export simple -- file >actual &&
+	sed -ne "s/^M .* //p" <actual | sort -u >actual.files &&
+	echo file >expect &&
+	test_cmp expect actual.files
+'
+
 test_expect_success 'avoid corrupt stream with non-existent mark' '
 	test_create_repo avoid_non_existent_mark &&
 	(

Original file line number	Diff line number	Diff line change
`@@ -500,6 +500,13 @@ test_expect_success 'path limiting with import-marks does not lose unmodified fi`
`500`	`500`	`grep file0 actual`
`501`	`501`	`'`
`502`	`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`	`+`
`503`	`510`	`test_expect_success 'avoid corrupt stream with non-existent mark' '`
`504`	`511`	`test_create_repo avoid_non_existent_mark &&`
`505`	`512`	`(`