From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/2] grep: Add the option '--open-files-in-pager'
Date: Fri, 4 Jun 2010 20:40:21 -0500 [thread overview]
Message-ID: <20100605014021.GA1778@progeny.tock> (raw)
In-Reply-To: <20100605005322.GB8774@progeny.tock>
Jonathan Nieder wrote:
> +test_expect_success 'git grep -O jumps to line in less' '
> + cat >expect <<-\EOF &&
> + +/*GREP_PATTERN
> + grep.h
> + EOF
> + >empty &&
> +
> + GIT_PAGER=./less git grep -O GREP_PATTERN >out
> + test_cmp expect actual &&
Ugh. We need a static analyzer for shell scripts. :) Short of that,
here’s a fixup to squash in.
Sorry for the trouble.
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index 72e4023..fcfc56e 100644
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -97,7 +97,7 @@ test_expect_success 'git grep -O jumps to line in less' '
EOF
>empty &&
- GIT_PAGER=./less git grep -O GREP_PATTERN >out
+ GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
test_cmp expect actual &&
test_cmp empty out
'
@@ -134,7 +134,7 @@ test_expect_success 'run from subdir' '
cd subdir &&
export GIT_PAGER &&
GIT_PAGER='\''printf "%s\n" >../args'\'' &&
- git grep -O "enum grep_pat_token" >../out
+ git grep -O "enum grep_pat_token" >../out &&
GIT_PAGER="pwd >../dir; :" &&
git grep -O "enum grep_pat_token" >../out2
) &&
--
next prev parent reply other threads:[~2010-06-05 1:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 0:51 [PATCH v2 0/2] Teach 'git grep' about --open-files-in-pager=[<pager>] Jonathan Nieder
2010-06-05 0:53 ` [PATCH 1/2] grep: Add the option '--open-files-in-pager' Jonathan Nieder
2010-06-05 1:40 ` Jonathan Nieder [this message]
2010-06-05 0:55 ` [PATCH 2/2] grep -O: allow optional argument specifying the pager (or editor) Jonathan Nieder
2010-06-05 16:11 ` [PATCH v2 0/2] Teach 'git grep' about --open-files-in-pager=[<pager>] Johannes Schindelin
2010-06-12 7:55 ` Jonathan Nieder
2010-06-12 9:46 ` Johannes Schindelin
2010-06-12 16:29 ` [PATCH v3 0/4] " Jonathan Nieder
2010-06-12 16:31 ` [PATCH 1/4] grep: refactor grep_objects loop into its own function Jonathan Nieder
2010-06-12 16:32 ` [PATCH 2/4] Unify code paths of threaded greps Jonathan Nieder
2010-06-12 16:36 ` [PATCH 3/4] grep: Add the option '--open-files-in-pager' Jonathan Nieder
2010-06-12 16:39 ` [PATCH 4/4] grep -O: allow optional argument specifying the pager (or editor) Jonathan Nieder
2010-06-12 17:16 ` Paolo Bonzini
2010-06-13 16:35 ` Junio C Hamano
2010-06-13 17:04 ` Paolo Bonzini
2010-06-14 6:31 ` Jonathan Nieder
2010-06-12 21:36 ` [PATCH v3 0/4] Teach 'git grep' about --open-files-in-pager=[<pager>] Johannes Schindelin
2010-06-12 22:12 ` Jonathan Nieder
2010-06-12 11:38 ` [PATCH v2 0/2] " Paolo Bonzini
2010-06-12 14:50 ` Jonathan Nieder
-- strict thread matches above, loose matches on Subject: below --
2010-03-26 10:48 [PATCH " Johannes Schindelin
2010-03-26 10:49 ` [PATCH 1/2] grep: Add the option '--open-files-in-pager' Johannes Schindelin
2010-03-28 4:09 ` Jonathan Nieder
2010-03-29 17:13 ` Johannes Schindelin
2010-03-29 18:17 ` Junio C Hamano
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=20100605014021.GA1778@progeny.tock \
--to=jrnieder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).