[v5,0/7] subject: Clean up tests for test_cmp arg ordering and pipe placement

Commit Message

Matthew DeVore Oct. 5, 2018, 9:54 p.m. UTC

This version of the patchset fixes some wording and formatting issues
pointed out by Junio. The commit message in the first patch has also
been reworded.

Thank you,
Matt


Matthew DeVore (7):
  t/README: reformat Do, Don't, Keep in mind lists
  Documentation: add shell guidelines
  tests: standardize pipe placement
  t/*: fix ordering of expected/observed arguments
  tests: don't swallow Git errors upstream of pipes
  t9109: don't swallow Git errors upstream of pipes
  tests: order arguments to git-rev-list properly

 Documentation/CodingGuidelines         |  18 ++
 t/README                               |  69 +++--
 t/lib-gpg.sh                           |   9 +-
 t/t0000-basic.sh                       |   2 +-
 t/t0021-conversion.sh                  |   4 +-
 t/t1006-cat-file.sh                    |   8 +-
 t/t1300-config.sh                      |   9 +-
 t/t1303-wacky-config.sh                |   4 +-
 t/t2101-update-index-reupdate.sh       |   2 +-
 t/t3200-branch.sh                      |   2 +-
 t/t3320-notes-merge-worktrees.sh       |   4 +-
 t/t3400-rebase.sh                      |   8 +-
 t/t3417-rebase-whitespace-fix.sh       |   6 +-
 t/t3702-add-edit.sh                    |   4 +-
 t/t3903-stash.sh                       |   8 +-
 t/t3905-stash-include-untracked.sh     |   2 +-
 t/t4025-hunk-header.sh                 |   2 +-
 t/t4117-apply-reject.sh                |   6 +-
 t/t4124-apply-ws-rule.sh               |  30 +--
 t/t4138-apply-ws-expansion.sh          |   2 +-
 t/t5317-pack-objects-filter-objects.sh | 360 ++++++++++++++-----------
 t/t5318-commit-graph.sh                |   2 +-
 t/t5500-fetch-pack.sh                  |   7 +-
 t/t5616-partial-clone.sh               |  50 ++--
 t/t5701-git-serve.sh                   |  14 +-
 t/t5702-protocol-v2.sh                 |  14 +-
 t/t6023-merge-file.sh                  |  12 +-
 t/t6027-merge-binary.sh                |   4 +-
 t/t6031-merge-filemode.sh              |   2 +-
 t/t6112-rev-list-filters-objects.sh    | 237 +++++++++-------
 t/t7201-co.sh                          |   4 +-
 t/t7406-submodule-update.sh            |   8 +-
 t/t7800-difftool.sh                    |   2 +-
 t/t9100-git-svn-basic.sh               |   2 +-
 t/t9101-git-svn-props.sh               |  34 ++-
 t/t9133-git-svn-nested-git-repo.sh     |   6 +-
 t/t9600-cvsimport.sh                   |   2 +-
 t/t9603-cvsimport-patchsets.sh         |   4 +-
 t/t9604-cvsimport-timestamps.sh        |   4 +-
 39 files changed, 568 insertions(+), 399 deletions(-)

Comments

Junio C Hamano Oct. 6, 2018, 11:53 p.m. UTC | #1

Matthew DeVore <[e-mail]> writes:

> This version of the patchset fixes some wording and formatting issues
> pointed out by Junio. The commit message in the first patch has also
> been reworded.


Thanks.

If no further major issues are raised, let's merge it to 'next'.

Patch

diff --git a/t/README b/t/README
index 9a71d5732..ab9fa4230 100644
--- a/t/README
+++ b/t/README
@@ -394,7 +394,7 @@  This test harness library does the following things:
    --debug (or -d), and --immediate (or -i) is given.
 
 Do's & don'ts
--------------------------------------
+-------------
 
 Here are a few examples of things you probably should and shouldn't do
 when writing tests.
@@ -466,8 +466,7 @@  And here are the "don'ts:"
    platform commands; just use '! cmd'.  We are not in the business
    of verifying that the world given to us sanely works.
 
- - Don't use Git upstream in the non-final position in a piped chain, as
-   in:
+ - Don't feed the output of a git command to a pipe, as in:
 
      git -C repo ls-files |
      xargs -n 1 basename |
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index eeedd1623..6ff614692 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -35,7 +35,7 @@  test_expect_success 'setup bare clone for server' '
 test_expect_success 'do partial clone 1' '
         git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
 
-        git -C pc1 rev-list --quiet --objects --missing=print >revs HEAD &&
+        git -C pc1 rev-list --quiet --objects --missing=print HEAD >revs &&
         awk -f print_1.awk revs |
         sed "s/?//" |
         sort >observed.oids &&
@@ -93,8 +93,8 @@  test_expect_success 'verify diff causes dynamic object fetch' '
 test_expect_success 'verify blame causes dynamic object fetch' '
         git -C pc1 blame origin/master -- file.1.txt >observed.blame &&
         test_cmp expect.blame observed.blame &&
-        git -C pc1 rev-list --quiet --objects --missing=print >observed \
-                master..origin/master &&
+        git -C pc1 rev-list --quiet --objects --missing=print \
+                master..origin/master >observed &&
         test_line_count = 0 observed
 '