From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: David Aguilar <davvid@gmail.com>, Git ML <git@vger.kernel.org>,
Denton Liu <liu.denton@gmail.com>
Subject: Re: [PATCH] difftool: fix bug when printing usage
Date: Mon, 06 Feb 2017 10:13:10 -0800 [thread overview]
Message-ID: <xmqqinon2nnt.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1702061716120.3496@virtualbox> (Johannes Schindelin's message of "Mon, 6 Feb 2017 17:58:49 +0100 (CET)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> +test_expect_success 'basic usage requires no repo' '
>> + lines=$(git difftool -h | grep ^usage: | wc -l) &&
>> + test "$lines" -eq 1 &&
>
> It may be easier to debug future breakages if you wrote
>
> git difftool -h | grep ^usage: >output &&
> test_line_count = 1 output &&
> or even better (changing the semantics now):
>
> test_expect_code 129 git difftool -h >output &&
> grep ^usage: output &&
True.
>> + # create a ceiling directory to prevent Git from finding a repo
>> + mkdir -p not/repo &&
>> + ceiling="$PWD/not" &&
>> + lines=$(cd not/repo &&
>> + GIT_CEILING_DIRECTORIES="$ceiling" git difftool -h |
>> + grep ^usage: | wc -l) &&
>> + test "$lines" -eq 1 &&
>
> Likewise, this would become
>
> GIT_CEILING_DIRECTORIES="$PWD/not" \
> test_expect_code 129 git -C not/repo difftool -h >output &&
> grep ^usage: output
I agree with the intent, but the execution here is "Not quite".
test_expect_code being a shell function, it does not take the
"one-shot environment assignment for this single invocation," like
external commands do.
> More importantly: When I read $PWD all kinds of alarm bells go off in my
> head, as I immediately think of all the issues we have on Windows due to
> Git's regression test using POSIX paths all over the place.
And we appreciate that somebody who is more familiar with the issue
is watching ;-).
> Insofar as I am the author of the builtin difftool:
>
> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
OK, thanks.
next prev parent reply other threads:[~2017-02-06 18:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-04 2:56 [PATCH] Remove --no-gui option from difftool usage string Denton Liu
2017-02-04 5:58 ` Jacob Keller
2017-02-04 6:23 ` Denton Liu
2017-02-05 10:22 ` David Aguilar
2017-02-05 20:17 ` [BUG] was: " David Aguilar
2017-02-05 21:23 ` [PATCH] difftool: fix bug when printing usage David Aguilar
2017-02-06 16:58 ` Johannes Schindelin
2017-02-06 18:13 ` Junio C Hamano [this message]
2017-02-07 11:21 ` Johannes Schindelin
2017-02-07 20:03 ` Junio C Hamano
2017-02-07 20:06 ` Junio C Hamano
2017-02-08 15:06 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqinon2nnt.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).