Charvi Mendiratta <charvi077@xxxxxxxxx> writes: > Modern practice is to avoid multiple commands per line, > and instead place each command on its own line. > > Signed-off-by: Charvi Mendiratta <charvi077@xxxxxxxxx> > --- This looks good, but I am wondering what happened between v3 and v4. As you've demonstrated through the microproject that you can now comfortably be involved in the review discussion, I am tempted to suggest that we declare victory at this point and move on, but I don't know what the plans are for the other 4 patches (I guess we won't miss them that much---the micros are meant to be practice targets). Thanks. > t/t7201-co.sh | 26 ++++++++++++++++++-------- > 1 file changed, 18 insertions(+), 8 deletions(-) > > diff --git a/t/t7201-co.sh b/t/t7201-co.sh > index 5898182fd2..b36a93056f 100755 > --- a/t/t7201-co.sh > +++ b/t/t7201-co.sh > @@ -157,7 +157,8 @@ test_expect_success 'checkout -m with merge conflict' ' > ' > > test_expect_success 'format of merge conflict from checkout -m' ' > - git checkout -f master && git clean -f && > + git checkout -f master && > + git clean -f && > > fill b d >two && > git checkout -m simple && > @@ -180,7 +181,9 @@ test_expect_success 'format of merge conflict from checkout -m' ' > ' > > test_expect_success 'checkout --merge --conflict=diff3 <branch>' ' > - git checkout -f master && git reset --hard && git clean -f && > + git checkout -f master && > + git reset --hard && > + git clean -f && > > fill b d >two && > git checkout --merge --conflict=diff3 simple && > @@ -205,7 +208,9 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' ' > ' > > test_expect_success 'switch to another branch while carrying a deletion' ' > - git checkout -f master && git reset --hard && git clean -f && > + git checkout -f master && > + git reset --hard && > + git clean -f && > git rm two && > > test_must_fail git checkout simple 2>errs && > @@ -218,7 +223,8 @@ test_expect_success 'switch to another branch while carrying a deletion' ' > test_expect_success 'checkout to detach HEAD (with advice declined)' ' > git config advice.detachedHead false && > rev=$(git rev-parse --short renamer^) && > - git checkout -f renamer && git clean -f && > + git checkout -f renamer && > + git clean -f && > git checkout renamer^ 2>messages && > test_i18ngrep "HEAD is now at $rev" messages && > test_line_count = 1 messages && > @@ -237,7 +243,8 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' ' > test_expect_success 'checkout to detach HEAD' ' > git config advice.detachedHead true && > rev=$(git rev-parse --short renamer^) && > - git checkout -f renamer && git clean -f && > + git checkout -f renamer && > + git clean -f && > GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages && > grep "HEAD is now at $rev" messages && > test_line_count -gt 1 messages && > @@ -254,7 +261,8 @@ test_expect_success 'checkout to detach HEAD' ' > ' > > test_expect_success 'checkout to detach HEAD with branchname^' ' > - git checkout -f master && git clean -f && > + git checkout -f master && > + git clean -f && > git checkout renamer^ && > H=$(git rev-parse --verify HEAD) && > M=$(git show-ref -s --verify refs/heads/master) && > @@ -269,7 +277,8 @@ test_expect_success 'checkout to detach HEAD with branchname^' ' > ' > > test_expect_success 'checkout to detach HEAD with :/message' ' > - git checkout -f master && git clean -f && > + git checkout -f master && > + git clean -f && > git checkout ":/Initial" && > H=$(git rev-parse --verify HEAD) && > M=$(git show-ref -s --verify refs/heads/master) && > @@ -284,7 +293,8 @@ test_expect_success 'checkout to detach HEAD with :/message' ' > ' > > test_expect_success 'checkout to detach HEAD with HEAD^0' ' > - git checkout -f master && git clean -f && > + git checkout -f master && > + git clean -f && > git checkout HEAD^0 && > H=$(git rev-parse --verify HEAD) && > M=$(git show-ref -s --verify refs/heads/master) &&
