"Jeff Hostetler via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx> > > fixup! help: include fsmonitor--daemon feature flag in version info Do you want me to kick part-2 out of 'next' so that these can be squashed into the original commits that need fixing? If not, you would want to have a real commit log message instead. The patch text looks good, even though I had to see if 'output' may clobber or collide with names used in tests that want the prerequisite. > Signed-off-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx> > --- > t/test-lib.sh | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/t/test-lib.sh b/t/test-lib.sh > index 46cd596e7f5..5d819c1bc11 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -1803,5 +1803,6 @@ GIT_TEST_MAINT_SCHEDULER="none:exit 1" > # Does this platform support `git fsmonitor--daemon` > # > test_lazy_prereq FSMONITOR_DAEMON ' > - git version --build-options | grep "feature:" | grep "fsmonitor--daemon" > + git version --build-options >output && > + grep "feature: fsmonitor--daemon" output > '
