Subject: Re: [PATCH v3 10/30] subtree: t7900: add a test for the -h flag

From: Luke Shumaker <[email-masked]>
Date: Fri, 30 Apr 2021 10:40:26 -0600

On Fri, 30 Apr 2021 04:01:50 -0600,
Ævar Arnfjörð Bjarmason wrote:
> 
> 
> On Tue, Apr 27 2021, Luke Shumaker wrote:
> 
> > From: Luke Shumaker <[email-masked]>
> >
> > It's a dumb test, but it's surprisingly easy to break.
> >
> > Signed-off-by: Luke Shumaker <[email-masked]>
> > ---
> >  contrib/subtree/t/t7900-subtree.sh | 7 +++++++
> >  1 file changed, 7 insertions(+)
> >
> > diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
> > index 5c2510f1f5..9afba2f282 100755
> > --- a/contrib/subtree/t/t7900-subtree.sh
> > +++ b/contrib/subtree/t/t7900-subtree.sh
> > @@ -37,6 +37,13 @@ last_commit_subject () {
> >  	git log --pretty=format:%s -1
> >  }
> >  
> > +test_expect_success 'shows short help text for -h' '
> > +	test_expect_code 129 git subtree -h >out 2>err &&
> > +	test_must_be_empty err &&
> > +	grep -e "^ *or: git subtree pull" out &&
> > +	grep -e --annotate out
> 
> I wonder if "grep -e --could-be-an-option-if-not-for-e" is portable,
> probably....

It's POSIX, and at least works on GNU, busybox, and macOS
(based-on-FreeBSD) grep.  If it turns out there's somewhere it doesn't
work, I'd be happy to change it, but my baseline assumption is that
it's portable.

-- 
Happy hacking,
~ Luke Shumaker