From: Karthik Nayak Date: Wed, 18 Nov 2026 11:21:19 GMT Subject: Re: [PATCH] fast-import: do not show the path when "feature export-marks" is forbidden Message-ID: In-Reply-To: <20261117-ks-fast-import-consistent-check-unsafe-v1-1-fc1ed53c79b2@gmail.com> Kaartic Sivaraam writes: > Since 68061e3470 (fast-import: disallow "feature export-marks" by > default, 2019-08-29), a stream that uses "feature export-marks=" > without --allow-unsafe-features dies with > > feature 'export-marks=' forbidden in input without --allow-unsafe-features > > because the whole feature string, including the "=" argument, > is passed to check_unsafe_feature(). The import-marks variants pass > just the feature name, so their messages do not include the path. > > Pass "export-marks" to match, and make the existing test check the > message, not just that the command fails. > It's not just 'import-marks', but all other features provide a static string. So makes sense. > Signed-off-by: Kaartic Sivaraam > --- > While backporting patches for a security release, I noticed this. > Was waiting for the security fix to go out before sending it. > --- > builtin/fast-import.c | 2 +- > t/t9300-fast-import.sh | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/builtin/fast-import.c b/builtin/fast-import.c > index ab5d2a2344..998167794c 100644 > --- a/builtin/fast-import.c > +++ b/builtin/fast-import.c > @@ -3918,7 +3918,7 @@ static int parse_one_feature(struct fast_import_state *state, > check_unsafe_feature(state, "import-marks-if-exists"); > option_import_marks(state, arg, 1, 1); > } else if (skip_prefix(feature, "export-marks=", &arg)) { > - check_unsafe_feature(state, feature); > + check_unsafe_feature(state, "export-marks"); Change looks sensible! > option_export_marks(state, arg); > } else if (!strcmp(feature, "alias")) { > ; /* Don't die - this feature is supported */ > diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh > index 15f511fb6b..33c04e0315 100755 > --- a/t/t9300-fast-import.sh > +++ b/t/t9300-fast-import.sh > @@ -2337,7 +2337,8 @@ test_expect_success 'R: only one import-marks feature allowed per stream' ' > > test_expect_success 'R: export-marks feature forbidden by default' ' > echo "feature export-marks=git.marks" >input && > - test_must_fail git fast-import + test_must_fail git fast-import err && > + test_grep "feature .export-marks. forbidden" err > ' > Sigh, this will conflict with my long series [1]. So one of us will have to merge the other topic in and send in a new version. Let's see how things go :) > test_expect_success 'R: export-marks feature results in a marks file being created' ' > > --- > base-commit: e1ec09b23c8e0deb21a0b95ac5996422277395d4 > change-id: 20261104-ks-fast-import-consistent-check-unsafe-0a94ffda7518 [1]: https://lore.kernel.org/git/20261112-kn-fast-import-tests-1-v2-0-b8c3a0ab27e8@gmail.com/