Merge branch 'rs/archive-filter-error-once'

ttaylorr · ttaylorr · commit 3e9303dc8e7c · 2022-11-08T17:15:09.000-05:00
"git archive" mistakenly complained twice about a missing executable,
which has been corrected.

* rs/archive-filter-error-once:
  archive-tar: report filter start error only once
diff --git a/archive-tar.c b/archive-tar.c
@@ -498,6 +498,7 @@ static int write_tar_filter_archive(const struct archiver *ar,
 	strvec_push(&filter.args, cmd.buf);
 	filter.use_shell = 1;
 	filter.in = -1;
+	filter.silent_exec_failure = 1;
 
 	if (start_command(&filter) < 0)
 		die_errno(_("unable to start '%s' filter"), cmd.buf);
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
@@ -342,6 +342,13 @@ test_expect_success 'only enabled filters are available remotely' '
 	test_cmp_bin remote.bar config.bar
 '
 
+test_expect_success 'invalid filter is reported only once' '
+	test_must_fail git -c tar.invalid.command= archive --format=invalid \
+		HEAD >out 2>err &&
+	test_must_be_empty out &&
+	test_line_count = 1 err
+'
+
 test_expect_success 'git archive --format=tgz' '
 	git archive --format=tgz HEAD >j.tgz
 '

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,13 @@ test_expect_success 'only enabled filters are available remotely' '`
`342`	`342`	`test_cmp_bin remote.bar config.bar`
`343`	`343`	`'`
`344`	`344`
	`345`	`+test_expect_success 'invalid filter is reported only once' '`
	`346`	`+ test_must_fail git -c tar.invalid.command= archive --format=invalid \`
	`347`	`+ HEAD >out 2>err &&`
	`348`	`+ test_must_be_empty out &&`
	`349`	`+ test_line_count = 1 err`
	`350`	`+'`
	`351`	`+`
`345`	`352`	`test_expect_success 'git archive --format=tgz' '`
`346`	`353`	`git archive --format=tgz HEAD >j.tgz`
`347`	`354`	`'`