Re: [PATCH 1/2] t5403: Refactor

From: Orgad Shaneh <orgads@gmail.com>
Date: Dec 24, 2018, 20:54 UTC
Message-ID: <CAGHpTBLP2emg5L9vT9OPneapNP_6eHRXYF-9jT20ZkD07HJKJw@mail.gmail.com>
In-Reply-To: <CAGHpTB+9L55Gvezhb7x6Kb49WS_nfzmKdVvpH3_=6GM7y8YQ_g@mail.gmail.com>

Hi Johannes,

Thanks for reviewing this.

On Fri, Dec 21, 2018 at 6:06 PM Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 31 quoted lines

>
> Hi Orgad,
>
> On Thu, 20 Dec 2018, orgads@gmail.com wrote:
>
> > diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
> > index fc898c9eac..7e941537f9 100755
> > --- a/t/t5403-post-checkout-hook.sh
> > +++ b/t/t5403-post-checkout-hook.sh
> > @@ -7,67 +7,48 @@ test_description='Test the post-checkout hook.'
> >  . ./test-lib.sh
> >
> >  test_expect_success setup '
> > -     echo Data for commit0. >a &&
> > -     echo Data for commit0. >b &&
> > -     git update-index --add a &&
> > -     git update-index --add b &&
> > -     tree0=$(git write-tree) &&
> > -     commit0=$(echo setup | git commit-tree $tree0) &&
> > -     git update-ref refs/heads/master $commit0 &&
> > -     git clone ./. clone1 &&
> > -     git clone ./. clone2 &&
> > -     GIT_DIR=clone2/.git git branch new2 &&
> > -     echo Data for commit1. >clone2/b &&
> > -     GIT_DIR=clone2/.git git add clone2/b &&
> > -     GIT_DIR=clone2/.git git commit -m new2
> > +     test_commit one &&
> > +    test_commit two &&
> > +    test_commit three three &&
>
> A very nice simplification (but please use tabs to indent).

Thanks. I already did. I sent these patches twice - first revision had spaces, and the second one had tabs.

Show 20 quoted lines

> > +    mv .git/hooks-disabled .git/hooks
> >  '
> >
> > -for clone in 1 2; do
> > -    cat >clone${clone}/.git/hooks/post-checkout <<'EOF'
> > +cat >.git/hooks/post-checkout <<'EOF'
> >  #!/bin/sh
> > -echo $@ > $GIT_DIR/post-checkout.args
> > +echo $@ > .git/post-checkout.args
>
> While at it, you could lose the space after the redirector that we seem to
> no longer prefer:
>
> > +echo $@ >.git/post-checkout.args
>
> And since we are already cleaning up, we could easily move use
> write_script instead, *and* move it into the `setup` test case (which
> makes it easier to use something like
>
>         sh t5403-post-checkout-hook.sh --run=1,13

Done.

Show 7 quoted lines

> The rest looks good (modulo indentation issues). I would have preferred
> the separate concerns to be addressed in individual commits (one commit to
> replace the `awk` calls, one to avoid the clones, one to simplify by using
> `test_commit`, etc), as that would have been easier to review. But others
> might disagree (Junio recently made the case of smooshing separate
> concerns into single commits, even squashing two of my patches into one
> against my wish), so... I guess you don't have to change this.

I also like commit granularity, but since I'm not familiar with the workflow in the mailing list, how to amend and resend commits etc. I try to keep the number of commits low :)

Thanks,
- Orgad