* [PATCH] Fix t4017-diff-retval for white-space from wc
@ 2008-06-29 20:49 Brian Gernhardt
0 siblings, 0 replies; 3+ messages in thread
From: Brian Gernhardt @ 2008-06-29 20:49 UTC (permalink / raw)
To: Git List
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
---
t/t4017-diff-retval.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Also: we have t4017-diff-retval and t4017-quiet. Should one of
these be renamed?
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index d748d45..60dd201 100755
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
@@ -123,7 +123,7 @@ test_expect_success 'check detects leftover conflict markers' '
git --no-pager diff --cached --check >test.out
test $? = 2
) &&
- test "$(grep "conflict marker" test.out | wc -l)" = 3 &&
+ test 3 = $(grep "conflict marker" test.out | wc -l) &&
git reset --hard
'
--
1.5.6.105.g6f4b
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] Fix t4017-diff-retval for white-space from wc
@ 2008-06-30 1:26 Brian Gernhardt
2008-06-30 1:29 ` Brian Gernhardt
0 siblings, 1 reply; 3+ messages in thread
From: Brian Gernhardt @ 2008-06-30 1:26 UTC (permalink / raw)
To: Git List; +Cc: Brian Gernhardt
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
---
t/t4017-diff-retval.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index d748d45..60dd201 100755
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
@@ -123,7 +123,7 @@ test_expect_success 'check detects leftover conflict markers' '
git --no-pager diff --cached --check >test.out
test $? = 2
) &&
- test "$(grep "conflict marker" test.out | wc -l)" = 3 &&
+ test 3 = $(grep "conflict marker" test.out | wc -l) &&
git reset --hard
'
--
1.5.6.105.g6f4b
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix t4017-diff-retval for white-space from wc
2008-06-30 1:26 Brian Gernhardt
@ 2008-06-30 1:29 ` Brian Gernhardt
0 siblings, 0 replies; 3+ messages in thread
From: Brian Gernhardt @ 2008-06-30 1:29 UTC (permalink / raw)
To: Brian Gernhardt; +Cc: Git List
Sorry about duplicate. Forgot to remove sendemail.to when testing git-
send-email. (Finally tracked down my problems to a bug in
Term::ReadLine::Perl when the prompt was longer than the terminal
width.)
~~ Brian
On Jun 29, 2008, at 9:26 PM, Brian Gernhardt wrote:
> Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
> ---
> t/t4017-diff-retval.sh | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
> index d748d45..60dd201 100755
> --- a/t/t4017-diff-retval.sh
> +++ b/t/t4017-diff-retval.sh
> @@ -123,7 +123,7 @@ test_expect_success 'check detects leftover
> conflict markers' '
> git --no-pager diff --cached --check >test.out
> test $? = 2
> ) &&
> - test "$(grep "conflict marker" test.out | wc -l)" = 3 &&
> + test 3 = $(grep "conflict marker" test.out | wc -l) &&
> git reset --hard
> '
>
> --
> 1.5.6.105.g6f4b
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-30 1:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-29 20:49 [PATCH] Fix t4017-diff-retval for white-space from wc Brian Gernhardt
-- strict thread matches above, loose matches on Subject: below --
2008-06-30 1:26 Brian Gernhardt
2008-06-30 1:29 ` Brian Gernhardt
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).