threads / patch / 13281

patchUse the modern syntax of git-diff-files in t2002-checkout-cache-u.sh

Subject: [PATCH] Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh

## tl;dr

3 messages between Apr 27, 2008 and Apr 27, 2008. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Alex Riesen· Apr 27, 2008, 11:31 UTC · lore

As a nice side effect it also fixes t2002-checkout-cache-u.sh on FreeBSD 4, /bin/sh of which has problems interpreting "! command" construction.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---

To be honest - it was the other way around: I wanted to fix the test on FreeBSD, but ended up using --exit-code and test_must_fail

 t/t2002-checkout-cache-u.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to t/t2002-checkout-cache-u.sh +2 −2

diff --git a/t/t2002-checkout-cache-u.sh b/t/t2002-checkout-cache-u.sh
index 0f441bc..70361c8 100755
--- a/t/t2002-checkout-cache-u.sh
+++ b/t/t2002-checkout-cache-u.sh
@@ -21,13 +21,13 @@ test_expect_success \
 rm -f path0 &&
 git read-tree $t &&
 git checkout-index -f -a &&
-! git diff-files | diff - /dev/null'
+test_must_fail git diff-files --exit-code'
 
 test_expect_success \
 'with -u, git checkout-index picks up stat information from new files.' '
 rm -f path0 &&
 git read-tree $t &&
 git checkout-index -u -f -a &&
-git diff-files | diff - /dev/null'
+git diff-files --exit-code'
 
 test_done

-- 
1.5.5.1.113.g4af4

Junio C Hamano· Apr 27, 2008, 17:21 UTC · re: Alex Riesen · lore

Re: [PATCH] Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh

Alex Riesen <raa.lkml@gmail.com> writes:

Show 8 quoted lines

> As a nice side effect it also fixes t2002-checkout-cache-u.sh on FreeBSD 4,
> /bin/sh of which has problems interpreting "! command" construction.
>
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> ---
>
> To be honest - it was the other way around: I wanted to fix the test
> on FreeBSD, but ended up using --exit-code and test_must_fail

Do you mean /bin/sh there misinterprets "! cmd1 | cmd2" as "(! cmd1) | cmd2" and always returns true or something silly like that? I see a few other places in t3400, t3700, t5302, t7002, etc. that use that construct without an obvious workaround "! (cmd1 | cmd2)" which t0030 uses.

Show 7 quoted lines

>  test_expect_success \
>  'with -u, git checkout-index picks up stat information from new files.' '
>  rm -f path0 &&
>  git read-tree $t &&
>  git checkout-index -u -f -a &&
> -git diff-files | diff - /dev/null'
> +git diff-files --exit-code'

Is this something FreeBSD 4 has trouble with as well (not a request to drop this hunk but asking for info)?

Alex Riesen· Apr 27, 2008, 17:49 UTC · re: Junio C Hamano · lore

Re: [PATCH] Use the modern syntax of git-diff-files in t2002-checkout-cache-u.sh

Junio C Hamano, Sun, Apr 27, 2008 19:21:30 +0200:

Show 15 quoted lines

> Alex Riesen <raa.lkml@gmail.com> writes:
> 
> > As a nice side effect it also fixes t2002-checkout-cache-u.sh on FreeBSD 4,
> > /bin/sh of which has problems interpreting "! command" construction.
> >
> > Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> > ---
> >
> > To be honest - it was the other way around: I wanted to fix the test
> > on FreeBSD, but ended up using --exit-code and test_must_fail
> 
> Do you mean /bin/sh there misinterprets "! cmd1 | cmd2" as "(! cmd1) |
> cmd2" and always returns true or something silly like that?  I see a few
> other places in t3400, t3700, t5302, t7002, etc. that use that construct
> without an obvious workaround "! (cmd1 | cmd2)" which t0030 uses.

Yes. That one was just a place I very slowly got to (I have not much motivation and only one _very remote_ (and production) machine to try things on).

Show 10 quoted lines

> >  test_expect_success \
> >  'with -u, git checkout-index picks up stat information from new files.' '
> >  rm -f path0 &&
> >  git read-tree $t &&
> >  git checkout-index -u -f -a &&
> > -git diff-files | diff - /dev/null'
> > +git diff-files --exit-code'
> 
> Is this something FreeBSD 4 has trouble with as well (not a request to
> drop this hunk but asking for info)?

No, this is just the same file and similar construction (use external diff just to figure out if there are any differences). This is why I (re)named the patch for "modern syntax". It is named "make t2002 work on FreeBSD4" in my tree.