@matheusbsbs / matheus-bagliano / commits / 99094a7ad4

t: fix trivial &&-chain breakage

These are tests which are missing a link in their &&-chain, but during a setup phase. We may fail to notice failure in commands that build the test environment, but these are typically not expected to fail at all (but it's still good to double-check that our test environment is what we expect). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 20, 2015 at 06:07 UTC 99094a7ad484085b9f6849a8ebe1e23467c5bc14
43 files changed +70 -68
t/annotate-tests.sh
+1 -1
@@ -405,7 +405,7 @@ test_expect_success 'setup -L :regex' '
405 mv hello.c hello.orig &&
406 echo "#include <stdio.h>" >hello.c &&
407 cat hello.orig >>hello.c &&
408 - tr Q "\\t" >>hello.c <<-\EOF
408 + tr Q "\\t" >>hello.c <<-\EOF &&
409 void mail()
410 {
411 Qputs("mail");
t/t0000-basic.sh
+2 -2
@@ -253,7 +253,7 @@ test_expect_success 'test --verbose' '
253 test_expect_success "failing test" false
254 test_done
255 EOF
256 - mv test-verbose/out test-verbose/out+
256 + mv test-verbose/out test-verbose/out+ &&
257 grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out &&
258 check_sub_test_lib_test test-verbose <<-\EOF
259 > expecting success: true
@@ -974,7 +974,7 @@ test_expect_success 'writing this tree with --missing-ok' '
974
975 ################################################################
976 test_expect_success 'git read-tree followed by write-tree should be idempotent' '
977 - rm -f .git/index
977 + rm -f .git/index &&
978 git read-tree $tree &&
979 test -f .git/index &&
980 newtree=$(git write-tree) &&
t/t0011-hashmap.sh
+1 -1
@@ -218,7 +218,7 @@ test_expect_success 'grow / shrink' '
218 echo size >> in &&
219 echo 64 51 >> expect &&
220 echo put key52 value52 >> in &&
221 - echo NULL >> expect
221 + echo NULL >> expect &&
222 echo size >> in &&
223 echo 256 52 >> expect &&
224 for n in $(test_seq 12)
t/t0201-gettext-fallbacks.sh
+2 -2
@@ -50,7 +50,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
50
51 test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
52 cmdline="git am" &&
53 - export cmdline;
53 + export cmdline &&
54 printf "When you have resolved this problem, run git am --resolved." >expect &&
55 eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
56 test_i18ncmp expect actual
@@ -58,7 +58,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
58
59 test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
60 cmdline="git am" &&
61 - export cmdline;
61 + export cmdline &&
62 printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
63 eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
64 test_i18ncmp expect actual
t/t1006-cat-file.sh
+1 -1
@@ -274,7 +274,7 @@ test_expect_success 'setup blobs which are likely to delta' '
274 '
275
276 test_expect_success 'confirm that neither loose blob is a delta' '
277 - cat >expect <<-EOF
277 + cat >expect <<-EOF &&
278 $_z40
279 $_z40
280 EOF
t/t3010-ls-files-killed-modified.sh
+1 -1
@@ -62,7 +62,7 @@ test_expect_success 'git update-index --add to add various paths.' '
62 cd submod$i && git commit --allow-empty -m "empty $i"
63 ) || break
64 done &&
65 - git update-index --add submod[12]
65 + git update-index --add submod[12] &&
66 (
67 cd submod1 &&
68 git commit --allow-empty -m "empty 1 (updated)"
t/t3404-rebase-interactive.sh
+1 -1
@@ -1007,7 +1007,7 @@ test_expect_success 'rebase -i with --strategy and -X' '
1007 '
1008
1009 test_expect_success 'rebase -i error on commits with \ in message' '
1010 - current_head=$(git rev-parse HEAD)
1010 + current_head=$(git rev-parse HEAD) &&
1011 test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
1012 test_commit TO-REMOVE will-conflict old-content &&
1013 test_commit "\temp" will-conflict new-content dummy &&
t/t3405-rebase-malformed.sh
+2 -2
@@ -24,7 +24,7 @@ test_expect_success setup '
24 git add file1 file2 &&
25 test_tick &&
26 git commit -m "Initial commit" &&
27 - git branch diff-in-message
27 + git branch diff-in-message &&
28
29 git checkout -b multi-line-subject &&
30 cat F >file2 &&
@@ -36,7 +36,7 @@ test_expect_success setup '
36
37 git checkout diff-in-message &&
38 echo "commit log message containing a diff" >G &&
39 - echo "" >>G
39 + echo "" >>G &&
40 cat G >file2 &&
41 git add file2 &&
42 git diff --cached >>G &&
t/t3425-rebase-topology-merges.sh
+2 -2
@@ -24,7 +24,7 @@ test_expect_success 'setup of non-linear-history' '
24 test_commit c &&
25 git checkout b &&
26 test_commit d &&
27 - test_commit e
27 + test_commit e &&
28
29 git checkout c &&
30 test_commit g &&
@@ -33,7 +33,7 @@ test_expect_success 'setup of non-linear-history' '
33 cherry_pick gp g &&
34 test_commit i &&
35 git checkout b &&
36 - test_commit f
36 + test_commit f &&
37
38 git checkout d &&
39 test_commit n &&
t/t3600-rm.sh
+2 -2
@@ -183,7 +183,7 @@ test_expect_success 'refuse to remove cached empty file with modifications' '
183
184 test_expect_success 'remove intent-to-add file without --force' '
185 echo content >intent-to-add &&
186 - git add -N intent-to-add
186 + git add -N intent-to-add &&
187 git rm --cached intent-to-add
188 '
189
@@ -201,7 +201,7 @@ test_expect_success 'Recursive without -r fails' '
201 '
202
203 test_expect_success 'Recursive with -r but dirty' '
204 - echo qfwfq >>frotz/nitfol
204 + echo qfwfq >>frotz/nitfol &&
205 test_must_fail git rm -r frotz &&
206 test -d frotz &&
207 test -f frotz/nitfol
t/t4014-format-patch.sh
+1 -1
@@ -802,7 +802,7 @@ test_expect_success '--no-signature suppresses format.signaturefile ' '
802 '
803
804 test_expect_success '--signature-file overrides format.signaturefile' '
805 - cat >other-mail-signature <<-\EOF
805 + cat >other-mail-signature <<-\EOF &&
806 Use this other signature instead of mail-signature.
807 EOF
808 test_config format.signaturefile mail-signature &&
t/t4041-diff-submodule-option.sh
+6 -4
@@ -528,10 +528,12 @@ test_expect_success 'diff --submodule with objects referenced by alternates' '
528 sha1_before=$(git rev-parse --short HEAD)
529 echo b >b &&
530 git add b &&
531 - git commit -m b
532 - sha1_after=$(git rev-parse --short HEAD)
533 - echo "Submodule sub $sha1_before..$sha1_after:
534 - > b" >../expected
531 + git commit -m b &&
532 + sha1_after=$(git rev-parse --short HEAD) &&
533 + {
534 + echo "Submodule sub $sha1_before..$sha1_after:" &&
535 + echo " > b"
536 + } >../expected
537 ) &&
538 (cd super &&
539 (cd sub &&
t/t4049-diff-stat-count.sh
+3 -3
@@ -18,7 +18,7 @@ test_expect_success 'mode-only change show as a 0-line change' '
18 test_chmod +x b d &&
19 echo a >a &&
20 echo c >c &&
21 - cat >expect <<-\EOF
21 + cat >expect <<-\EOF &&
22 a | 1 +
23 b | 0
24 ...
@@ -33,7 +33,7 @@ test_expect_success 'binary changes do not count in lines' '
33 echo a >a &&
34 echo c >c &&
35 cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
36 - cat >expect <<-\EOF
36 + cat >expect <<-\EOF &&
37 a | 1 +
38 c | 1 +
39 ...
@@ -55,7 +55,7 @@ test_expect_success 'exclude unmerged entries from total file count' '
55 done |
56 git update-index --index-info &&
57 echo d >d &&
58 - cat >expect <<-\EOF
58 + cat >expect <<-\EOF &&
59 a | 1 +
60 b | 1 +
61 ...
t/t4054-diff-bogus-tree.sh
+1 -1
@@ -16,7 +16,7 @@ test_expect_success 'create bogus tree' '
16 test_expect_success 'create tree with matching file' '
17 echo bar >foo &&
18 git add foo &&
19 - good_tree=$(git write-tree)
19 + good_tree=$(git write-tree) &&
20 blob=$(git rev-parse :foo)
21 '
22
t/t5500-fetch-pack.sh
+1 -1
@@ -414,7 +414,7 @@ test_expect_success 'setup tests for the --stdin parameter' '
414 do
415 git tag $head $head
416 done &&
417 - cat >input <<-\EOF
417 + cat >input <<-\EOF &&
418 refs/heads/C
419 refs/heads/A
420 refs/heads/D
t/t5510-fetch.sh
+1 -1
@@ -596,7 +596,7 @@ test_configured_prune () {
596 test_unconfig remote.origin.prune &&
597 git fetch &&
598 git rev-parse --verify refs/remotes/origin/newbranch
599 - )
599 + ) &&
600
601 # now remove it
602 git branch -d newbranch &&
t/t5526-fetch-submodules.sh
+5 -5
@@ -216,7 +216,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched"
216 head2=$(git rev-parse --short HEAD) &&
217 echo "Fetching submodule submodule" > expect.out.sub &&
218 echo "From $pwd/." > expect.err.sub &&
219 - echo " $head1..$head2 master -> origin/master" >> expect.err.sub
219 + echo " $head1..$head2 master -> origin/master" >>expect.err.sub &&
220 head -2 expect.err >> expect.err.sub &&
221 (
222 cd downstream &&
@@ -315,7 +315,7 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne
315 ) &&
316 head1=$(git rev-parse --short HEAD^) &&
317 git add subdir/deepsubmodule &&
318 - git commit -m "new deepsubmodule"
318 + git commit -m "new deepsubmodule" &&
319 head2=$(git rev-parse --short HEAD) &&
320 echo "From $pwd/submodule" > ../expect.err.sub &&
321 echo " $head1..$head2 master -> origin/master" >> ../expect.err.sub
@@ -337,7 +337,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
337 head2=$(git rev-parse --short HEAD) &&
338 tail -2 expect.err > expect.err.deepsub &&
339 echo "From $pwd/." > expect.err &&
340 - echo " $head1..$head2 master -> origin/master" >> expect.err
340 + echo " $head1..$head2 master -> origin/master" >>expect.err &&
341 cat expect.err.sub >> expect.err &&
342 cat expect.err.deepsub >> expect.err &&
343 (
@@ -387,7 +387,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
387 git commit -m "new submodule" &&
388 head2=$(git rev-parse --short HEAD) &&
389 echo "From $pwd/." > expect.err.2 &&
390 - echo " $head1..$head2 master -> origin/master" >> expect.err.2
390 + echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
391 head -2 expect.err >> expect.err.2 &&
392 (
393 cd downstream &&
@@ -415,7 +415,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
415 git commit -m "new submodule" &&
416 head2=$(git rev-parse --short HEAD) &&
417 echo "From $pwd/." > expect.err.2 &&
418 - echo " $head1..$head2 master -> origin/master" >> expect.err.2
418 + echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
419 head -2 expect.err >> expect.err.2 &&
420 (
421 cd downstream &&
t/t5531-deep-submodule-push.sh
+1 -1
@@ -104,7 +104,7 @@ test_expect_success 'push fails when commit on multiple branches if one branch h
104 '
105
106 test_expect_success 'push succeeds if submodule has no remote and is on the first superproject commit' '
107 - git init --bare a
107 + git init --bare a &&
108 git clone a a1 &&
109 (
110 cd a1 &&
t/t5533-push-cas.sh
+2 -2
@@ -159,7 +159,7 @@ test_expect_success 'cover everything with default force-with-lease (protected)'
159 (
160 cd src &&
161 git branch naster master^
162 - )
162 + ) &&
163 git ls-remote src refs/heads/\* >expect &&
164 (
165 cd dst &&
@@ -174,7 +174,7 @@ test_expect_success 'cover everything with default force-with-lease (allowed)' '
174 (
175 cd src &&
176 git branch naster master^
177 - )
177 + ) &&
178 (
179 cd dst &&
180 git fetch &&
t/t5541-http-push-smart.sh
+1 -1
@@ -158,7 +158,7 @@ test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
158 test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
159 # create a dissimilarly-named remote ref so that git is unable to match the
160 # two refs (viz. local, remote) unless an explicit refspec is provided.
161 - git push origin master:retsam
161 + git push origin master:retsam &&
162
163 echo "change changed" > path2 &&
164 git commit -a -m path2 --amend &&
t/t5550-http-fetch-dumb.sh
+1 -1
@@ -15,7 +15,7 @@ test_expect_success 'setup repository' '
15 git config push.default matching &&
16 echo content1 >file &&
17 git add file &&
18 - git commit -m one
18 + git commit -m one &&
19 echo content2 >file &&
20 git add file &&
21 git commit -m two
t/t5551-http-fetch-smart.sh
+1 -1
@@ -83,7 +83,7 @@ test_expect_success 'clone http repository' '
83 test_expect_success 'fetch changes via http' '
84 echo content >>file &&
85 git commit -a -m two &&
86 - git push public
86 + git push public &&
87 (cd clone && git pull) &&
88 test_cmp file clone/file
89 '
t/t6000-rev-list-misc.sh
+2 -2
@@ -42,7 +42,7 @@ test_expect_success 'rev-list --objects with pathspecs and copied files' '
42 test_tick &&
43 git commit -m that &&
44
45 - ONE=$(git rev-parse HEAD:one)
45 + ONE=$(git rev-parse HEAD:one) &&
46 git rev-list --objects HEAD two >output &&
47 grep "$ONE two/three" output &&
48 ! grep one output
@@ -85,7 +85,7 @@ test_expect_success 'rev-list can show index objects' '
85 # - we do not show the root tree; since we updated the index, it
86 # does not have a valid cache tree
87 #
88 - cat >expect <<-\EOF
88 + cat >expect <<-\EOF &&
89 8e4020bb5a8d8c873b25de15933e75cc0fc275df one
90 d9d3a7417b9605cfd88ee6306b28dadc29e6ab08 only-in-index
91 9200b628cf9dc883a85a7abc8d6e6730baee589c two
t/t6006-rev-list-format.sh
+1 -1
@@ -45,7 +45,7 @@ test_expect_success 'setup' '
45 head2=$(git rev-parse --verify HEAD) &&
46 head2_short=$(git rev-parse --verify --short $head2) &&
47 tree2=$(git rev-parse --verify HEAD:) &&
48 - tree2_short=$(git rev-parse --verify --short $tree2)
48 + tree2_short=$(git rev-parse --verify --short $tree2) &&
49 git config --unset i18n.commitEncoding
50 '
51
t/t6022-merge-rename.sh
+3 -3
@@ -685,7 +685,7 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' '
685 git add -A &&
686 git commit -mA &&
687
688 - git checkout -b side
688 + git checkout -b side &&
689 git rm -rf df &&
690 git commit -mB &&
691
@@ -716,7 +716,7 @@ test_expect_success 'setup avoid unnecessary update, modify/delete' '
716 git add -A &&
717 git commit -mA &&
718
719 - git checkout -b side
719 + git checkout -b side &&
720 git rm -f file &&
721 git commit -m "Delete file" &&
722
@@ -745,7 +745,7 @@ test_expect_success 'setup avoid unnecessary update, rename/add-dest' '
745 git add -A &&
746 git commit -mA &&
747
748 - git checkout -b side
748 + git checkout -b side &&
749 cp file newfile &&
750 git add -A &&
751 git commit -m "Add file copy" &&
t/t6036-recursive-corner-cases.sh
+1 -1
@@ -86,7 +86,7 @@ test_expect_success 'setup criss-cross + rename merges with basic modification'
86 rm -rf .git &&
87 git init &&
88
89 - ten="0 1 2 3 4 5 6 7 8 9"
89 + ten="0 1 2 3 4 5 6 7 8 9" &&
90 for i in $ten
91 do
92 echo line $i in a sample file
t/t6111-rev-list-treesame.sh
+1 -1
@@ -58,7 +58,7 @@ test_expect_success setup '
58
59 git checkout master &&
60 test_tick && git merge --no-ff fiddler-branch &&
61 - note K
61 + note K &&
62
63 test_commit "file=Part 1" file "Part 1" L &&
64
t/t6200-fmt-merge-msg.sh
+1 -1
@@ -194,7 +194,7 @@ test_expect_success '--log=5 with custom comment character' '
194 '
195
196 test_expect_success 'merge.log=0 disables shortlog' '
197 - echo "Merge branch ${apos}left${apos}" >expected
197 + echo "Merge branch ${apos}left${apos}" >expected &&
198 git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
199 test_cmp expected actual
200 '
t/t7004-tag.sh
+1 -1
@@ -1180,7 +1180,7 @@ test_expect_success 'message in editor has initial comment: first line' '
1180 test_expect_success \
1181 'message in editor has initial comment: remainder' '
1182 # remove commented lines from the remainder -- should be empty
1183 - >rest.expect
1183 + >rest.expect &&
1184 sed -e 1d -e '/^#/d' <actual >rest.actual &&
1185 test_cmp rest.expect rest.actual
1186 '
t/t7006-pager.sh
+1 -1
@@ -396,7 +396,7 @@ test_expect_success TTY 'command-specific pager overrides core.pager' '
396 sane_unset PAGER GIT_PAGER &&
397 echo "foo:initial" >expect &&
398 >actual &&
399 - test_config core.pager "exit 1"
399 + test_config core.pager "exit 1" &&
400 test_config pager.log "sed s/^/foo:/ >actual" &&
401 test_terminal git log --format=%s -1 &&
402 test_cmp expect actual
t/t7009-filter-branch-null-sha1.sh
+1 -1
@@ -13,7 +13,7 @@ test_expect_success 'setup: a commit with a bogus null sha1 in the tree' '
13 {
14 git ls-tree HEAD &&
15 printf "160000 commit $_z40\\tbroken\\n"
16 - } >broken-tree
16 + } >broken-tree &&
17 echo "add broken entry" >msg &&
18
19 tree=$(git mktree <broken-tree) &&
t/t7400-submodule-basic.sh
+2 -2
@@ -766,7 +766,7 @@ test_expect_success 'moving the superproject does not break submodules' '
766 (
767 cd addtest &&
768 git submodule status >expect
769 - )
769 + ) &&
770 mv addtest addtest2 &&
771 (
772 cd addtest2 &&
@@ -987,7 +987,7 @@ test_expect_success 'submodule with UTF-8 name' '
987
988 test_expect_success 'submodule add clone shallow submodule' '
989 mkdir super &&
990 - pwd=$(pwd)
990 + pwd=$(pwd) &&
991 (
992 cd super &&
993 git init &&
t/t7406-submodule-update.sh
+1 -1
@@ -754,7 +754,7 @@ test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd'
754
755 test_expect_success 'submodule update clone shallow submodule' '
756 git clone cloned super3 &&
757 - pwd=$(pwd)
757 + pwd=$(pwd) &&
758 (cd super3 &&
759 sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
760 mv -f .gitmodules.tmp .gitmodules &&
t/t7508-status.sh
+4 -4
@@ -431,7 +431,7 @@ test_expect_success 'status -s -uno' '
431 '
432
433 test_expect_success 'status -s (status.showUntrackedFiles no)' '
434 - git config status.showuntrackedfiles no
434 + git config status.showuntrackedfiles no &&
435 git status -s >output &&
436 test_cmp expect output
437 '
@@ -465,7 +465,7 @@ EOF
465 '
466
467 test_expect_success 'status (status.showUntrackedFiles normal)' '
468 - test_config status.showuntrackedfiles normal
468 + test_config status.showuntrackedfiles normal &&
469 git status >output &&
470 test_i18ncmp expect output
471 '
@@ -485,7 +485,7 @@ test_expect_success 'status -s -unormal' '
485 '
486
487 test_expect_success 'status -s (status.showUntrackedFiles normal)' '
488 - git config status.showuntrackedfiles normal
488 + git config status.showuntrackedfiles normal &&
489 git status -s >output &&
490 test_cmp expect output
491 '
@@ -520,7 +520,7 @@ EOF
520 '
521
522 test_expect_success 'status (status.showUntrackedFiles all)' '
523 - test_config status.showuntrackedfiles all
523 + test_config status.showuntrackedfiles all &&
524 git status >output &&
525 test_i18ncmp expect output
526 '
t/t7510-signed-commit.sh
+1 -1
@@ -42,7 +42,7 @@ test_expect_success GPG 'create signed commits' '
42 git tag seventh-unsigned &&
43
44 test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
45 - git tag seventh-signed
45 + git tag seventh-signed &&
46
47 echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 &&
48 git tag eighth-signed-alt
t/t7600-merge.sh
+1 -1
@@ -133,7 +133,7 @@ test_expect_success 'setup' '
133 test_tick &&
134 git commit -m "commit 3" &&
135 git tag c3 &&
136 - c3=$(git rev-parse HEAD)
136 + c3=$(git rev-parse HEAD) &&
137 git reset --hard "$c0" &&
138 create_merge_msgs
139 '
t/t7612-merge-verify-signatures.sh
+1 -1
@@ -29,7 +29,7 @@ test_expect_success GPG 'create signed commits' '
29
30 git checkout -b side-untrusted &&
31 echo 3 >baz && git add baz &&
32 - test_tick && git commit -SB7227189 -m "untrusted on side"
32 + test_tick && git commit -SB7227189 -m "untrusted on side" &&
33
34 git checkout master
35 '
t/t8003-blame-corner-cases.sh
+4 -4
@@ -26,7 +26,7 @@ test_expect_success setup '
26 cat one >uno &&
27 mv two dos &&
28 cat one >>tres &&
29 - echo DEF >>mouse
29 + echo DEF >>mouse &&
30 git add uno dos tres mouse &&
31 test_tick &&
32 GIT_AUTHOR_NAME=Second git commit -a -m Second &&
@@ -153,15 +153,15 @@ test_expect_success 'blame path that used to be a directory' '
153 '
154
155 test_expect_success 'blame to a commit with no author name' '
156 - TREE=`git rev-parse HEAD:`
157 - cat >badcommit <<EOF
156 + TREE=`git rev-parse HEAD:` &&
157 + cat >badcommit <<EOF &&
158 tree $TREE
159 author <noname> 1234567890 +0000
160 committer David Reiss <dreiss@facebook.com> 1234567890 +0000
161
162 some message
163 EOF
164 - COMMIT=`git hash-object -t commit -w badcommit`
164 + COMMIT=`git hash-object -t commit -w badcommit` &&
165 git --no-pager blame $COMMIT -- uno >/dev/null
166 '
167
t/t8008-blame-formats.sh
+1 -1
@@ -5,7 +5,7 @@ test_description='blame output in various formats on a simple case'
5
6 test_expect_success 'setup' '
7 echo a >file &&
8 - git add file
8 + git add file &&
9 test_tick &&
10 git commit -m one &&
11 echo b >>file &&
t/t9001-send-email.sh
+1 -1
@@ -1325,7 +1325,7 @@ test_expect_success $PREREQ 'sendemail.transferencoding=7bit fails on 8bit data'
1325
1326 test_expect_success $PREREQ '--transfer-encoding overrides sendemail.transferEncoding' '
1327 clean_fake_sendmail &&
1328 - git config sendemail.transferEncoding 8bit
1328 + git config sendemail.transferEncoding 8bit &&
1329 test_must_fail git send-email \
1330 --transfer-encoding=7bit \
1331 --smtp-server="$(pwd)/fake.sendmail" \
t/t9300-fast-import.sh
+1 -1
@@ -1132,7 +1132,7 @@ test_expect_success \
1132 compare_diff_raw expect actual'
1133
1134 test_expect_success PIPE 'N: read and copy directory' '
1135 - cat >expect <<-\EOF
1135 + cat >expect <<-\EOF &&
1136 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1137 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1138 EOF
t/t9500-gitweb-standalone-no-errors.sh
+1 -1
@@ -297,7 +297,7 @@ test_expect_success 'setup incomplete lines' '
297 echo "Dominus regit me," >file &&
298 echo "incomplete line" | tr -d "\\012" >>file &&
299 git commit -a -m "Change incomplete line" &&
300 - git tag incomplete_lines_chg
300 + git tag incomplete_lines_chg &&
301 echo "Dominus regit me," >file &&
302 git commit -a -m "Remove incomplete line" &&
303 git tag incomplete_lines_rem
t/t9903-bash-prompt.sh
+1 -1
@@ -166,7 +166,7 @@ test_expect_success 'prompt - inside bare repository' '
166 '
167
168 test_expect_success 'prompt - interactive rebase' '
169 - printf " (b1|REBASE-i 2/3)" >expected
169 + printf " (b1|REBASE-i 2/3)" >expected &&
170 write_script fake_editor.sh <<-\EOF &&
171 echo "exec echo" >"$1"
172 echo "edit $(git log -1 --format="%h")" >>"$1"