t3301: stop losing return codes of git commands

Currently, there are two ways where the return codes of git commands are
lost. The first way is when a command is in the upstream of a pipe. In a
pipe, only the return code of the last command is used. Thus, all other
commands will have their return codes masked. Rewrite pipes so that
there are no git commands upstream.

The other way is when a command is in a non-assignment command
substitution. The return code will be lost in favour of the surrounding
command's. Rewrite instances of this so that git commands are either run
on their own or in an assignment-only command substitution.

This patch fixes a real buggy test: in 'copy note with "git notes
copy"', `git notes` was mistyped as `git note`.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index d66a5f6faa0ae8c4aecde52decde951d07080615..8f4330300707191fe1fcf94e0f3ea29ac55d3c4e 100755 (executable)
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -54,7 +54,9 @@ test_expect_success 'create notes' '
        test_path_is_missing .git/NOTES_EDITMSG &&
        git ls-tree -r refs/notes/commits >actual &&
        test_line_count = 1 actual &&
-       test "b4" = "$(git notes show)" &&
+       echo b4 >expect &&
+       git notes show >actual &&
+       test_cmp expect actual &&
        git show HEAD^ &&
        test_must_fail git notes show HEAD^
 '
@@ -79,14 +81,21 @@ test_expect_success 'edit existing notes' '
        test_path_is_missing .git/NOTES_EDITMSG &&
        git ls-tree -r refs/notes/commits >actual &&
        test_line_count = 1 actual &&
-       test "b3" = "$(git notes show)" &&
+       echo b3 >expect &&
+       git notes show >actual &&
+       test_cmp expect actual &&
        git show HEAD^ &&
        test_must_fail git notes show HEAD^
 '
 
 test_expect_success 'show notes from treeish' '
-       test "b3" = "$(git notes --ref commits^{tree} show)" &&
-       test "b4" = "$(git notes --ref commits@{1} show)"
+       echo b3 >expect &&
+       git notes --ref commits^{tree} show >actual &&
+       test_cmp expect actual &&
+
+       echo b4 >expect &&
+       git notes --ref commits@{1} show >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'cannot edit notes from non-ref' '
@@ -99,7 +108,9 @@ test_expect_success 'cannot "git notes add -m" where notes already exists' '
        test_path_is_missing .git/NOTES_EDITMSG &&
        git ls-tree -r refs/notes/commits >actual &&
        test_line_count = 1 actual &&
-       test "b3" = "$(git notes show)" &&
+       echo b3 >expect &&
+       git notes show >actual &&
+       test_cmp expect actual &&
        git show HEAD^ &&
        test_must_fail git notes show HEAD^
 '
@@ -109,7 +120,9 @@ test_expect_success 'can overwrite existing note with "git notes add -f -m"' '
        test_path_is_missing .git/NOTES_EDITMSG &&
        git ls-tree -r refs/notes/commits >actual &&
        test_line_count = 1 actual &&
-       test "b1" = "$(git notes show)" &&
+       echo b1 >expect &&
+       git notes show >actual &&
+       test_cmp expect actual &&
        git show HEAD^ &&
        test_must_fail git notes show HEAD^
 '
@@ -119,7 +132,9 @@ test_expect_success 'add w/no options on existing note morphs into edit' '
        test_path_is_missing .git/NOTES_EDITMSG &&
        git ls-tree -r refs/notes/commits >actual &&
        test_line_count = 1 actual &&
-       test "b2" = "$(git notes show)" &&
+       echo b2 >expect &&
+       git notes show >actual &&
+       test_cmp expect actual &&
        git show HEAD^ &&
        test_must_fail git notes show HEAD^
 '
@@ -129,7 +144,9 @@ test_expect_success 'can overwrite existing note with "git notes add -f"' '
        test_path_is_missing .git/NOTES_EDITMSG &&
        git ls-tree -r refs/notes/commits >actual &&
        test_line_count = 1 actual &&
-       test "b1" = "$(git notes show)" &&
+       echo b1 >expect &&
+       git notes show >actual &&
+       test_cmp expect actual &&
        git show HEAD^ &&
        test_must_fail git notes show HEAD^
 '
@@ -146,7 +163,8 @@ test_expect_success 'show notes' '
                Notes:
                ${indent}b1
        EOF
-       ! (git cat-file commit HEAD | grep b1) &&
+       git cat-file commit HEAD >commits &&
+       ! grep b1 commits &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -472,9 +490,11 @@ test_expect_success 'removing with --stdin --ignore-missing' '
 test_expect_success 'list notes with "git notes list"' '
        commit_2=$(git rev-parse 2nd) &&
        commit_3=$(git rev-parse 3rd) &&
+       note_2=$(git rev-parse refs/notes/commits:$commit_2) &&
+       note_3=$(git rev-parse refs/notes/commits:$commit_3) &&
        sort -t" " -k2 >expect <<-EOF &&
-               $(git rev-parse refs/notes/commits:$commit_2) $commit_2
-               $(git rev-parse refs/notes/commits:$commit_3) $commit_3
+               $note_2 $commit_2
+               $note_3 $commit_3
        EOF
        git notes list >actual &&
        test_cmp expect actual
@@ -486,9 +506,7 @@ test_expect_success 'list notes with "git notes"' '
 '
 
 test_expect_success 'list specific note with "git notes list <object>"' '
-       cat >expect <<-EOF &&
-               $(git rev-parse refs/notes/commits:$commit_3)
-       EOF
+       git rev-parse refs/notes/commits:$commit_3 >expect &&
        git notes list HEAD^^ >actual &&
        test_cmp expect actual
 '
@@ -512,10 +530,11 @@ test_expect_success 'append to existing note with "git notes append"' '
 
 test_expect_success '"git notes list" does not expand to "git notes list HEAD"' '
        commit_5=$(git rev-parse 5th) &&
+       note_5=$(git rev-parse refs/notes/commits:$commit_5) &&
        sort -t" " -k2 >expect_list <<-EOF &&
-               $(git rev-parse refs/notes/commits:$commit_2) $commit_2
-               $(git rev-parse refs/notes/commits:$commit_3) $commit_3
-               $(git rev-parse refs/notes/commits:$commit_5) $commit_5
+               $note_2 $commit_2
+               $note_3 $commit_3
+               $note_5 $commit_5
        EOF
        git notes list >actual &&
        test_cmp expect_list actual
@@ -721,7 +740,8 @@ test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' '
        git notes show HEAD: >actual &&
        test_cmp expect actual &&
        echo "Note on a blob" >expect &&
-       filename=$(git ls-tree --name-only HEAD | head -n1) &&
+       git ls-tree --name-only HEAD >files &&
+       filename=$(head -n1 files) &&
        git notes add -m "Note on a blob" HEAD:$filename &&
        git notes show HEAD:$filename >actual &&
        test_cmp expect actual &&
@@ -745,10 +765,13 @@ test_expect_success 'create note from other note with "git notes add -C"' '
                Notes:
                ${indent}order test
        EOF
-       git notes add -C $(git notes list HEAD^) &&
+       note=$(git notes list HEAD^) &&
+       git notes add -C $note &&
        git log -1 >actual &&
        test_cmp expect actual &&
-       test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
+       git notes list HEAD^ >expect &&
+       git notes list HEAD >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'create note from non-existing note with "git notes add -C" fails' '
@@ -777,11 +800,12 @@ test_expect_success 'create note from blob with "git notes add -C" reuses blob i
                Notes:
                ${indent}This is a blob object
        EOF
-       blob=$(echo "This is a blob object" | git hash-object -w --stdin) &&
-       git notes add -C $blob &&
+       echo "This is a blob object" | git hash-object -w --stdin >blob &&
+       git notes add -C $(cat blob) &&
        git log -1 >actual &&
        test_cmp expect actual &&
-       test "$(git notes list HEAD)" = "$blob"
+       git notes list HEAD >actual &&
+       test_cmp blob actual
 '
 
 test_expect_success 'create note from other note with "git notes add -c"' '
@@ -797,7 +821,8 @@ test_expect_success 'create note from other note with "git notes add -c"' '
                Notes:
                ${indent}yet another note
        EOF
-       MSG="yet another note" git notes add -c $(git notes list HEAD^^) &&
+       note=$(git notes list HEAD^^) &&
+       MSG="yet another note" git notes add -c $note &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -822,7 +847,8 @@ test_expect_success 'append to note from other note with "git notes append -C"'
                ${indent}
                ${indent}yet another note
        EOF
-       git notes append -C $(git notes list HEAD^) HEAD^ &&
+       note=$(git notes list HEAD^) &&
+       git notes append -C $note HEAD^ &&
        git log -1 HEAD^ >actual &&
        test_cmp expect actual
 '
@@ -839,7 +865,8 @@ test_expect_success 'create note from other note with "git notes append -c"' '
                Notes:
                ${indent}other note
        EOF
-       MSG="other note" git notes append -c $(git notes list HEAD^) &&
+       note=$(git notes list HEAD^) &&
+       MSG="other note" git notes append -c $note &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -858,7 +885,8 @@ test_expect_success 'append to note from other note with "git notes append -c"'
                ${indent}
                ${indent}yet another note
        EOF
-       MSG="yet another note" git notes append -c $(git notes list HEAD) &&
+       note=$(git notes list HEAD) &&
+       MSG="yet another note" git notes append -c $note &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -878,7 +906,9 @@ test_expect_success 'copy note with "git notes copy"' '
        git notes copy 8th 4th &&
        git log 3rd..4th >actual &&
        test_cmp expect actual &&
-       test "$(git note list 4th)" = "$(git note list 8th)"
+       git notes list 4th >expect &&
+       git notes list 8th >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'copy note with "git notes copy" with default' '
@@ -899,14 +929,30 @@ test_expect_success 'copy note with "git notes copy" with default' '
        git notes copy HEAD^ &&
        git log -1 >actual &&
        test_cmp expect actual &&
-       test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
+       git notes list HEAD^ >expect &&
+       git notes list HEAD >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'prevent overwrite with "git notes copy"' '
        test_must_fail git notes copy HEAD~2 HEAD &&
+       cat >expect <<-EOF &&
+               commit $commit
+               Author: A U Thor <author@example.com>
+               Date:   Thu Apr 7 15:23:13 2005 -0700
+
+               ${indent}11th
+
+               Notes:
+               ${indent}other note
+               ${indent}
+               ${indent}yet another note
+       EOF
        git log -1 >actual &&
        test_cmp expect actual &&
-       test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
+       git notes list HEAD^ >expect &&
+       git notes list HEAD >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'allow overwrite with "git notes copy -f"' '
@@ -924,7 +970,9 @@ test_expect_success 'allow overwrite with "git notes copy -f"' '
        git notes copy -f HEAD~3 HEAD &&
        git log -1 >actual &&
        test_cmp expect actual &&
-       test "$(git notes list HEAD)" = "$(git notes list HEAD~3)"
+       git notes list HEAD~3 >expect &&
+       git notes list HEAD >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'allow overwrite with "git notes copy -f" with default' '
@@ -944,7 +992,9 @@ test_expect_success 'allow overwrite with "git notes copy -f" with default' '
        git notes copy -f HEAD~2 &&
        git log -1 >actual &&
        test_cmp expect actual &&
-       test "$(git notes list HEAD)" = "$(git notes list HEAD~2)"
+       git notes list HEAD~2 >expect &&
+       git notes list HEAD >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'cannot copy note from object without notes' '
@@ -979,13 +1029,21 @@ test_expect_success 'git notes copy --stdin' '
                ${indent}
                ${indent}yet another note
        EOF
-       (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
-       echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
-       git notes copy --stdin &&
+       from=$(git rev-parse HEAD~3) &&
+       to=$(git rev-parse HEAD^) &&
+       echo "$from" "$to" >copy &&
+       from=$(git rev-parse HEAD~2) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >>copy &&
+       git notes copy --stdin <copy &&
        git log -2 >actual &&
        test_cmp expect actual &&
-       test "$(git notes list HEAD)" = "$(git notes list HEAD~2)" &&
-       test "$(git notes list HEAD^)" = "$(git notes list HEAD~3)"
+       git notes list HEAD~2 >expect &&
+       git notes list HEAD >actual &&
+       test_cmp expect actual &&
+       git notes list HEAD~3 >expect &&
+       git notes list HEAD^ >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
@@ -1006,9 +1064,13 @@ test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
 
                ${indent}14th
        EOF
-       (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
-       echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
-       git notes copy --for-rewrite=foo &&
+       from=$(git rev-parse HEAD~3) &&
+       to=$(git rev-parse HEAD^) &&
+       echo "$from" "$to" >copy &&
+       from=$(git rev-parse HEAD~2) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >>copy &&
+       git notes copy --for-rewrite=foo <copy &&
        git log -2 >actual &&
        test_cmp expect actual
 '
@@ -1041,17 +1103,23 @@ test_expect_success 'git notes copy --for-rewrite (enabled)' '
        EOF
        test_config notes.rewriteMode overwrite &&
        test_config notes.rewriteRef "refs/notes/*" &&
-       (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
-       echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
-       git notes copy --for-rewrite=foo &&
+       from=$(git rev-parse HEAD~3) &&
+       to=$(git rev-parse HEAD^) &&
+       echo "$from" "$to" >copy &&
+       from=$(git rev-parse HEAD~2) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >>copy &&
+       git notes copy --for-rewrite=foo <copy &&
        git log -2 >actual &&
        test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (disabled)' '
        test_config notes.rewrite.bar false &&
-       echo $(git rev-parse HEAD~3) $(git rev-parse HEAD) |
-       git notes copy --for-rewrite=bar &&
+       from=$(git rev-parse HEAD~3) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >copy &&
+       git notes copy --for-rewrite=bar <copy &&
        git log -2 >actual &&
        test_cmp expect actual
 '
@@ -1071,8 +1139,10 @@ test_expect_success 'git notes copy --for-rewrite (overwrite)' '
        git notes add -f -m"a fresh note" HEAD^ &&
        test_config notes.rewriteMode overwrite &&
        test_config notes.rewriteRef "refs/notes/*" &&
-       echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-       git notes copy --for-rewrite=foo &&
+       from=$(git rev-parse HEAD^) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >copy &&
+       git notes copy --for-rewrite=foo <copy &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -1080,8 +1150,10 @@ test_expect_success 'git notes copy --for-rewrite (overwrite)' '
 test_expect_success 'git notes copy --for-rewrite (ignore)' '
        test_config notes.rewriteMode ignore &&
        test_config notes.rewriteRef "refs/notes/*" &&
-       echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-       git notes copy --for-rewrite=foo &&
+       from=$(git rev-parse HEAD^) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >copy &&
+       git notes copy --for-rewrite=foo <copy &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -1103,8 +1175,10 @@ test_expect_success 'git notes copy --for-rewrite (append)' '
        git notes add -f -m"another fresh note" HEAD^ &&
        test_config notes.rewriteMode concatenate &&
        test_config notes.rewriteRef "refs/notes/*" &&
-       echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-       git notes copy --for-rewrite=foo &&
+       from=$(git rev-parse HEAD^) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >copy &&
+       git notes copy --for-rewrite=foo <copy &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -1131,9 +1205,13 @@ test_expect_success 'git notes copy --for-rewrite (append two to one)' '
        git notes add -f -m"append 2" HEAD^^ &&
        test_config notes.rewriteMode concatenate &&
        test_config notes.rewriteRef "refs/notes/*" &&
-       (echo $(git rev-parse HEAD^) $(git rev-parse HEAD) &&
-       echo $(git rev-parse HEAD^^) $(git rev-parse HEAD)) |
-       git notes copy --for-rewrite=foo &&
+       from=$(git rev-parse HEAD^) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >copy &&
+       from=$(git rev-parse HEAD^^) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >>copy &&
+       git notes copy --for-rewrite=foo <copy &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -1142,8 +1220,10 @@ test_expect_success 'git notes copy --for-rewrite (append empty)' '
        git notes remove HEAD^ &&
        test_config notes.rewriteMode concatenate &&
        test_config notes.rewriteRef "refs/notes/*" &&
-       echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-       git notes copy --for-rewrite=foo &&
+       from=$(git rev-parse HEAD^) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >copy &&
+       git notes copy --for-rewrite=foo <copy &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -1163,8 +1243,10 @@ test_expect_success 'GIT_NOTES_REWRITE_MODE works' '
        test_config notes.rewriteMode concatenate &&
        test_config notes.rewriteRef "refs/notes/*" &&
        git notes add -f -m"replacement note 1" HEAD^ &&
-       echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-       GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo &&
+       from=$(git rev-parse HEAD^) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >copy &&
+       GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo <copy &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -1184,9 +1266,11 @@ test_expect_success 'GIT_NOTES_REWRITE_REF works' '
        git notes add -f -m"replacement note 2" HEAD^ &&
        test_config notes.rewriteMode overwrite &&
        test_unconfig notes.rewriteRef &&
-       echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
+       from=$(git rev-parse HEAD^) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >copy &&
        GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
-               git notes copy --for-rewrite=foo &&
+               git notes copy --for-rewrite=foo <copy &&
        git log -1 >actual &&
        test_cmp expect actual
 '
@@ -1195,9 +1279,11 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
        git notes add -f -m"replacement note 3" HEAD^ &&
        test_config notes.rewriteMode overwrite &&
        test_config notes.rewriteRef refs/notes/other &&
-       echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
+       from=$(git rev-parse HEAD^) &&
+       to=$(git rev-parse HEAD) &&
+       echo "$from" "$to" >copy &&
        GIT_NOTES_REWRITE_REF=refs/notes/commits \
-               git notes copy --for-rewrite=foo &&
+               git notes copy --for-rewrite=foo <copy &&
        git log -1 >actual &&
        grep "replacement note 3" actual
 '
@@ -1212,26 +1298,36 @@ test_expect_success 'git notes copy diagnoses too many or too few parameters' '
 test_expect_success 'git notes get-ref expands refs/heads/master to refs/notes/refs/heads/master' '
        test_unconfig core.notesRef &&
        sane_unset GIT_NOTES_REF &&
-       test "$(git notes --ref=refs/heads/master get-ref)" = "refs/notes/refs/heads/master"
+       echo refs/notes/refs/heads/master >expect &&
+       git notes --ref=refs/heads/master get-ref >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (no overrides)' '
        test_unconfig core.notesRef &&
        sane_unset GIT_NOTES_REF &&
-       test "$(git notes get-ref)" = "refs/notes/commits"
+       echo refs/notes/commits >expect &&
+       git notes get-ref >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (core.notesRef)' '
        test_config core.notesRef refs/notes/foo &&
-       test "$(git notes get-ref)" = "refs/notes/foo"
+       echo refs/notes/foo >expect &&
+       git notes get-ref >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (GIT_NOTES_REF)' '
-       test "$(GIT_NOTES_REF=refs/notes/bar git notes get-ref)" = "refs/notes/bar"
+       echo refs/notes/bar >expect &&
+       GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (--ref)' '
-       test "$(GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref)" = "refs/notes/baz"
+       echo refs/notes/baz >expect &&
+       GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual &&
+       test_cmp expect actual
 '
 
 test_expect_success 'setup testing of empty notes' '