mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
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>
This commit is contained in:
Jeff King
Junio C Hamano
parent
60687de5ba
commit
99094a7ad4
43 changed files with 70 additions and 68 deletions
|
|
@ -405,7 +405,7 @@ test_expect_success 'setup -L :regex' '
|
|||
mv hello.c hello.orig &&
|
||||
echo "#include <stdio.h>" >hello.c &&
|
||||
cat hello.orig >>hello.c &&
|
||||
tr Q "\\t" >>hello.c <<-\EOF
|
||||
tr Q "\\t" >>hello.c <<-\EOF &&
|
||||
void mail()
|
||||
{
|
||||
Qputs("mail");
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@ test_expect_success 'test --verbose' '
|
|||
test_expect_success "failing test" false
|
||||
test_done
|
||||
EOF
|
||||
mv test-verbose/out test-verbose/out+
|
||||
mv test-verbose/out test-verbose/out+ &&
|
||||
grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out &&
|
||||
check_sub_test_lib_test test-verbose <<-\EOF
|
||||
> expecting success: true
|
||||
|
|
@ -974,7 +974,7 @@ test_expect_success 'writing this tree with --missing-ok' '
|
|||
|
||||
################################################################
|
||||
test_expect_success 'git read-tree followed by write-tree should be idempotent' '
|
||||
rm -f .git/index
|
||||
rm -f .git/index &&
|
||||
git read-tree $tree &&
|
||||
test -f .git/index &&
|
||||
newtree=$(git write-tree) &&
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ test_expect_success 'grow / shrink' '
|
|||
echo size >> in &&
|
||||
echo 64 51 >> expect &&
|
||||
echo put key52 value52 >> in &&
|
||||
echo NULL >> expect
|
||||
echo NULL >> expect &&
|
||||
echo size >> in &&
|
||||
echo 256 52 >> expect &&
|
||||
for n in $(test_seq 12)
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
|
|||
|
||||
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
|
||||
cmdline="git am" &&
|
||||
export cmdline;
|
||||
export cmdline &&
|
||||
printf "When you have resolved this problem, run git am --resolved." >expect &&
|
||||
eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
|
||||
test_i18ncmp expect actual
|
||||
|
|
@ -58,7 +58,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
|
|||
|
||||
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
|
||||
cmdline="git am" &&
|
||||
export cmdline;
|
||||
export cmdline &&
|
||||
printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
|
||||
eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
|
||||
test_i18ncmp expect actual
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ test_expect_success 'setup blobs which are likely to delta' '
|
|||
'
|
||||
|
||||
test_expect_success 'confirm that neither loose blob is a delta' '
|
||||
cat >expect <<-EOF
|
||||
cat >expect <<-EOF &&
|
||||
$_z40
|
||||
$_z40
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ test_expect_success 'git update-index --add to add various paths.' '
|
|||
cd submod$i && git commit --allow-empty -m "empty $i"
|
||||
) || break
|
||||
done &&
|
||||
git update-index --add submod[12]
|
||||
git update-index --add submod[12] &&
|
||||
(
|
||||
cd submod1 &&
|
||||
git commit --allow-empty -m "empty 1 (updated)"
|
||||
|
|
|
|||
|
|
@ -1007,7 +1007,7 @@ test_expect_success 'rebase -i with --strategy and -X' '
|
|||
'
|
||||
|
||||
test_expect_success 'rebase -i error on commits with \ in message' '
|
||||
current_head=$(git rev-parse HEAD)
|
||||
current_head=$(git rev-parse HEAD) &&
|
||||
test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
|
||||
test_commit TO-REMOVE will-conflict old-content &&
|
||||
test_commit "\temp" will-conflict new-content dummy &&
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ test_expect_success setup '
|
|||
git add file1 file2 &&
|
||||
test_tick &&
|
||||
git commit -m "Initial commit" &&
|
||||
git branch diff-in-message
|
||||
git branch diff-in-message &&
|
||||
|
||||
git checkout -b multi-line-subject &&
|
||||
cat F >file2 &&
|
||||
|
|
@ -36,7 +36,7 @@ test_expect_success setup '
|
|||
|
||||
git checkout diff-in-message &&
|
||||
echo "commit log message containing a diff" >G &&
|
||||
echo "" >>G
|
||||
echo "" >>G &&
|
||||
cat G >file2 &&
|
||||
git add file2 &&
|
||||
git diff --cached >>G &&
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ test_expect_success 'setup of non-linear-history' '
|
|||
test_commit c &&
|
||||
git checkout b &&
|
||||
test_commit d &&
|
||||
test_commit e
|
||||
test_commit e &&
|
||||
|
||||
git checkout c &&
|
||||
test_commit g &&
|
||||
|
|
@ -33,7 +33,7 @@ test_expect_success 'setup of non-linear-history' '
|
|||
cherry_pick gp g &&
|
||||
test_commit i &&
|
||||
git checkout b &&
|
||||
test_commit f
|
||||
test_commit f &&
|
||||
|
||||
git checkout d &&
|
||||
test_commit n &&
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ test_expect_success 'refuse to remove cached empty file with modifications' '
|
|||
|
||||
test_expect_success 'remove intent-to-add file without --force' '
|
||||
echo content >intent-to-add &&
|
||||
git add -N intent-to-add
|
||||
git add -N intent-to-add &&
|
||||
git rm --cached intent-to-add
|
||||
'
|
||||
|
||||
|
|
@ -201,7 +201,7 @@ test_expect_success 'Recursive without -r fails' '
|
|||
'
|
||||
|
||||
test_expect_success 'Recursive with -r but dirty' '
|
||||
echo qfwfq >>frotz/nitfol
|
||||
echo qfwfq >>frotz/nitfol &&
|
||||
test_must_fail git rm -r frotz &&
|
||||
test -d frotz &&
|
||||
test -f frotz/nitfol
|
||||
|
|
|
|||
|
|
@ -802,7 +802,7 @@ test_expect_success '--no-signature suppresses format.signaturefile ' '
|
|||
'
|
||||
|
||||
test_expect_success '--signature-file overrides format.signaturefile' '
|
||||
cat >other-mail-signature <<-\EOF
|
||||
cat >other-mail-signature <<-\EOF &&
|
||||
Use this other signature instead of mail-signature.
|
||||
EOF
|
||||
test_config format.signaturefile mail-signature &&
|
||||
|
|
|
|||
|
|
@ -528,10 +528,12 @@ test_expect_success 'diff --submodule with objects referenced by alternates' '
|
|||
sha1_before=$(git rev-parse --short HEAD)
|
||||
echo b >b &&
|
||||
git add b &&
|
||||
git commit -m b
|
||||
sha1_after=$(git rev-parse --short HEAD)
|
||||
echo "Submodule sub $sha1_before..$sha1_after:
|
||||
> b" >../expected
|
||||
git commit -m b &&
|
||||
sha1_after=$(git rev-parse --short HEAD) &&
|
||||
{
|
||||
echo "Submodule sub $sha1_before..$sha1_after:" &&
|
||||
echo " > b"
|
||||
} >../expected
|
||||
) &&
|
||||
(cd super &&
|
||||
(cd sub &&
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ test_expect_success 'mode-only change show as a 0-line change' '
|
|||
test_chmod +x b d &&
|
||||
echo a >a &&
|
||||
echo c >c &&
|
||||
cat >expect <<-\EOF
|
||||
cat >expect <<-\EOF &&
|
||||
a | 1 +
|
||||
b | 0
|
||||
...
|
||||
|
|
@ -33,7 +33,7 @@ test_expect_success 'binary changes do not count in lines' '
|
|||
echo a >a &&
|
||||
echo c >c &&
|
||||
cat "$TEST_DIRECTORY"/test-binary-1.png >d &&
|
||||
cat >expect <<-\EOF
|
||||
cat >expect <<-\EOF &&
|
||||
a | 1 +
|
||||
c | 1 +
|
||||
...
|
||||
|
|
@ -55,7 +55,7 @@ test_expect_success 'exclude unmerged entries from total file count' '
|
|||
done |
|
||||
git update-index --index-info &&
|
||||
echo d >d &&
|
||||
cat >expect <<-\EOF
|
||||
cat >expect <<-\EOF &&
|
||||
a | 1 +
|
||||
b | 1 +
|
||||
...
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ test_expect_success 'create bogus tree' '
|
|||
test_expect_success 'create tree with matching file' '
|
||||
echo bar >foo &&
|
||||
git add foo &&
|
||||
good_tree=$(git write-tree)
|
||||
good_tree=$(git write-tree) &&
|
||||
blob=$(git rev-parse :foo)
|
||||
'
|
||||
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@ test_expect_success 'setup tests for the --stdin parameter' '
|
|||
do
|
||||
git tag $head $head
|
||||
done &&
|
||||
cat >input <<-\EOF
|
||||
cat >input <<-\EOF &&
|
||||
refs/heads/C
|
||||
refs/heads/A
|
||||
refs/heads/D
|
||||
|
|
|
|||
|
|
@ -596,7 +596,7 @@ test_configured_prune () {
|
|||
test_unconfig remote.origin.prune &&
|
||||
git fetch &&
|
||||
git rev-parse --verify refs/remotes/origin/newbranch
|
||||
)
|
||||
) &&
|
||||
|
||||
# now remove it
|
||||
git branch -d newbranch &&
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched"
|
|||
head2=$(git rev-parse --short HEAD) &&
|
||||
echo "Fetching submodule submodule" > expect.out.sub &&
|
||||
echo "From $pwd/." > expect.err.sub &&
|
||||
echo " $head1..$head2 master -> origin/master" >> expect.err.sub
|
||||
echo " $head1..$head2 master -> origin/master" >>expect.err.sub &&
|
||||
head -2 expect.err >> expect.err.sub &&
|
||||
(
|
||||
cd downstream &&
|
||||
|
|
@ -315,7 +315,7 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne
|
|||
) &&
|
||||
head1=$(git rev-parse --short HEAD^) &&
|
||||
git add subdir/deepsubmodule &&
|
||||
git commit -m "new deepsubmodule"
|
||||
git commit -m "new deepsubmodule" &&
|
||||
head2=$(git rev-parse --short HEAD) &&
|
||||
echo "From $pwd/submodule" > ../expect.err.sub &&
|
||||
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
|
|||
head2=$(git rev-parse --short HEAD) &&
|
||||
tail -2 expect.err > expect.err.deepsub &&
|
||||
echo "From $pwd/." > expect.err &&
|
||||
echo " $head1..$head2 master -> origin/master" >> expect.err
|
||||
echo " $head1..$head2 master -> origin/master" >>expect.err &&
|
||||
cat expect.err.sub >> expect.err &&
|
||||
cat expect.err.deepsub >> expect.err &&
|
||||
(
|
||||
|
|
@ -387,7 +387,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
|
|||
git commit -m "new submodule" &&
|
||||
head2=$(git rev-parse --short HEAD) &&
|
||||
echo "From $pwd/." > expect.err.2 &&
|
||||
echo " $head1..$head2 master -> origin/master" >> expect.err.2
|
||||
echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
|
||||
head -2 expect.err >> expect.err.2 &&
|
||||
(
|
||||
cd downstream &&
|
||||
|
|
@ -415,7 +415,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
|
|||
git commit -m "new submodule" &&
|
||||
head2=$(git rev-parse --short HEAD) &&
|
||||
echo "From $pwd/." > expect.err.2 &&
|
||||
echo " $head1..$head2 master -> origin/master" >> expect.err.2
|
||||
echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
|
||||
head -2 expect.err >> expect.err.2 &&
|
||||
(
|
||||
cd downstream &&
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ test_expect_success 'push fails when commit on multiple branches if one branch h
|
|||
'
|
||||
|
||||
test_expect_success 'push succeeds if submodule has no remote and is on the first superproject commit' '
|
||||
git init --bare a
|
||||
git init --bare a &&
|
||||
git clone a a1 &&
|
||||
(
|
||||
cd a1 &&
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ test_expect_success 'cover everything with default force-with-lease (protected)'
|
|||
(
|
||||
cd src &&
|
||||
git branch naster master^
|
||||
)
|
||||
) &&
|
||||
git ls-remote src refs/heads/\* >expect &&
|
||||
(
|
||||
cd dst &&
|
||||
|
|
@ -174,7 +174,7 @@ test_expect_success 'cover everything with default force-with-lease (allowed)' '
|
|||
(
|
||||
cd src &&
|
||||
git branch naster master^
|
||||
)
|
||||
) &&
|
||||
(
|
||||
cd dst &&
|
||||
git fetch &&
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
|
|||
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
|
||||
# create a dissimilarly-named remote ref so that git is unable to match the
|
||||
# two refs (viz. local, remote) unless an explicit refspec is provided.
|
||||
git push origin master:retsam
|
||||
git push origin master:retsam &&
|
||||
|
||||
echo "change changed" > path2 &&
|
||||
git commit -a -m path2 --amend &&
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ test_expect_success 'setup repository' '
|
|||
git config push.default matching &&
|
||||
echo content1 >file &&
|
||||
git add file &&
|
||||
git commit -m one
|
||||
git commit -m one &&
|
||||
echo content2 >file &&
|
||||
git add file &&
|
||||
git commit -m two
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ test_expect_success 'clone http repository' '
|
|||
test_expect_success 'fetch changes via http' '
|
||||
echo content >>file &&
|
||||
git commit -a -m two &&
|
||||
git push public
|
||||
git push public &&
|
||||
(cd clone && git pull) &&
|
||||
test_cmp file clone/file
|
||||
'
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ test_expect_success 'rev-list --objects with pathspecs and copied files' '
|
|||
test_tick &&
|
||||
git commit -m that &&
|
||||
|
||||
ONE=$(git rev-parse HEAD:one)
|
||||
ONE=$(git rev-parse HEAD:one) &&
|
||||
git rev-list --objects HEAD two >output &&
|
||||
grep "$ONE two/three" output &&
|
||||
! grep one output
|
||||
|
|
@ -85,7 +85,7 @@ test_expect_success 'rev-list can show index objects' '
|
|||
# - we do not show the root tree; since we updated the index, it
|
||||
# does not have a valid cache tree
|
||||
#
|
||||
cat >expect <<-\EOF
|
||||
cat >expect <<-\EOF &&
|
||||
8e4020bb5a8d8c873b25de15933e75cc0fc275df one
|
||||
d9d3a7417b9605cfd88ee6306b28dadc29e6ab08 only-in-index
|
||||
9200b628cf9dc883a85a7abc8d6e6730baee589c two
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ test_expect_success 'setup' '
|
|||
head2=$(git rev-parse --verify HEAD) &&
|
||||
head2_short=$(git rev-parse --verify --short $head2) &&
|
||||
tree2=$(git rev-parse --verify HEAD:) &&
|
||||
tree2_short=$(git rev-parse --verify --short $tree2)
|
||||
tree2_short=$(git rev-parse --verify --short $tree2) &&
|
||||
git config --unset i18n.commitEncoding
|
||||
'
|
||||
|
||||
|
|
|
|||
|
|
@ -685,7 +685,7 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' '
|
|||
git add -A &&
|
||||
git commit -mA &&
|
||||
|
||||
git checkout -b side
|
||||
git checkout -b side &&
|
||||
git rm -rf df &&
|
||||
git commit -mB &&
|
||||
|
||||
|
|
@ -716,7 +716,7 @@ test_expect_success 'setup avoid unnecessary update, modify/delete' '
|
|||
git add -A &&
|
||||
git commit -mA &&
|
||||
|
||||
git checkout -b side
|
||||
git checkout -b side &&
|
||||
git rm -f file &&
|
||||
git commit -m "Delete file" &&
|
||||
|
||||
|
|
@ -745,7 +745,7 @@ test_expect_success 'setup avoid unnecessary update, rename/add-dest' '
|
|||
git add -A &&
|
||||
git commit -mA &&
|
||||
|
||||
git checkout -b side
|
||||
git checkout -b side &&
|
||||
cp file newfile &&
|
||||
git add -A &&
|
||||
git commit -m "Add file copy" &&
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ test_expect_success 'setup criss-cross + rename merges with basic modification'
|
|||
rm -rf .git &&
|
||||
git init &&
|
||||
|
||||
ten="0 1 2 3 4 5 6 7 8 9"
|
||||
ten="0 1 2 3 4 5 6 7 8 9" &&
|
||||
for i in $ten
|
||||
do
|
||||
echo line $i in a sample file
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ test_expect_success setup '
|
|||
|
||||
git checkout master &&
|
||||
test_tick && git merge --no-ff fiddler-branch &&
|
||||
note K
|
||||
note K &&
|
||||
|
||||
test_commit "file=Part 1" file "Part 1" L &&
|
||||
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ test_expect_success '--log=5 with custom comment character' '
|
|||
'
|
||||
|
||||
test_expect_success 'merge.log=0 disables shortlog' '
|
||||
echo "Merge branch ${apos}left${apos}" >expected
|
||||
echo "Merge branch ${apos}left${apos}" >expected &&
|
||||
git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
|
|
|||
|
|
@ -1180,7 +1180,7 @@ test_expect_success 'message in editor has initial comment: first line' '
|
|||
test_expect_success \
|
||||
'message in editor has initial comment: remainder' '
|
||||
# remove commented lines from the remainder -- should be empty
|
||||
>rest.expect
|
||||
>rest.expect &&
|
||||
sed -e 1d -e '/^#/d' <actual >rest.actual &&
|
||||
test_cmp rest.expect rest.actual
|
||||
'
|
||||
|
|
|
|||
|
|
@ -396,7 +396,7 @@ test_expect_success TTY 'command-specific pager overrides core.pager' '
|
|||
sane_unset PAGER GIT_PAGER &&
|
||||
echo "foo:initial" >expect &&
|
||||
>actual &&
|
||||
test_config core.pager "exit 1"
|
||||
test_config core.pager "exit 1" &&
|
||||
test_config pager.log "sed s/^/foo:/ >actual" &&
|
||||
test_terminal git log --format=%s -1 &&
|
||||
test_cmp expect actual
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ test_expect_success 'setup: a commit with a bogus null sha1 in the tree' '
|
|||
{
|
||||
git ls-tree HEAD &&
|
||||
printf "160000 commit $_z40\\tbroken\\n"
|
||||
} >broken-tree
|
||||
} >broken-tree &&
|
||||
echo "add broken entry" >msg &&
|
||||
|
||||
tree=$(git mktree <broken-tree) &&
|
||||
|
|
|
|||
|
|
@ -766,7 +766,7 @@ test_expect_success 'moving the superproject does not break submodules' '
|
|||
(
|
||||
cd addtest &&
|
||||
git submodule status >expect
|
||||
)
|
||||
) &&
|
||||
mv addtest addtest2 &&
|
||||
(
|
||||
cd addtest2 &&
|
||||
|
|
@ -987,7 +987,7 @@ test_expect_success 'submodule with UTF-8 name' '
|
|||
|
||||
test_expect_success 'submodule add clone shallow submodule' '
|
||||
mkdir super &&
|
||||
pwd=$(pwd)
|
||||
pwd=$(pwd) &&
|
||||
(
|
||||
cd super &&
|
||||
git init &&
|
||||
|
|
|
|||
|
|
@ -754,7 +754,7 @@ test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd'
|
|||
|
||||
test_expect_success 'submodule update clone shallow submodule' '
|
||||
git clone cloned super3 &&
|
||||
pwd=$(pwd)
|
||||
pwd=$(pwd) &&
|
||||
(cd super3 &&
|
||||
sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
|
||||
mv -f .gitmodules.tmp .gitmodules &&
|
||||
|
|
|
|||
|
|
@ -431,7 +431,7 @@ test_expect_success 'status -s -uno' '
|
|||
'
|
||||
|
||||
test_expect_success 'status -s (status.showUntrackedFiles no)' '
|
||||
git config status.showuntrackedfiles no
|
||||
git config status.showuntrackedfiles no &&
|
||||
git status -s >output &&
|
||||
test_cmp expect output
|
||||
'
|
||||
|
|
@ -465,7 +465,7 @@ EOF
|
|||
'
|
||||
|
||||
test_expect_success 'status (status.showUntrackedFiles normal)' '
|
||||
test_config status.showuntrackedfiles normal
|
||||
test_config status.showuntrackedfiles normal &&
|
||||
git status >output &&
|
||||
test_i18ncmp expect output
|
||||
'
|
||||
|
|
@ -485,7 +485,7 @@ test_expect_success 'status -s -unormal' '
|
|||
'
|
||||
|
||||
test_expect_success 'status -s (status.showUntrackedFiles normal)' '
|
||||
git config status.showuntrackedfiles normal
|
||||
git config status.showuntrackedfiles normal &&
|
||||
git status -s >output &&
|
||||
test_cmp expect output
|
||||
'
|
||||
|
|
@ -520,7 +520,7 @@ EOF
|
|||
'
|
||||
|
||||
test_expect_success 'status (status.showUntrackedFiles all)' '
|
||||
test_config status.showuntrackedfiles all
|
||||
test_config status.showuntrackedfiles all &&
|
||||
git status >output &&
|
||||
test_i18ncmp expect output
|
||||
'
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ test_expect_success GPG 'create signed commits' '
|
|||
git tag seventh-unsigned &&
|
||||
|
||||
test_tick && git rebase -f HEAD^^ && git tag sixth-signed HEAD^ &&
|
||||
git tag seventh-signed
|
||||
git tag seventh-signed &&
|
||||
|
||||
echo 8 >file && test_tick && git commit -a -m eighth -SB7227189 &&
|
||||
git tag eighth-signed-alt
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ test_expect_success 'setup' '
|
|||
test_tick &&
|
||||
git commit -m "commit 3" &&
|
||||
git tag c3 &&
|
||||
c3=$(git rev-parse HEAD)
|
||||
c3=$(git rev-parse HEAD) &&
|
||||
git reset --hard "$c0" &&
|
||||
create_merge_msgs
|
||||
'
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ test_expect_success GPG 'create signed commits' '
|
|||
|
||||
git checkout -b side-untrusted &&
|
||||
echo 3 >baz && git add baz &&
|
||||
test_tick && git commit -SB7227189 -m "untrusted on side"
|
||||
test_tick && git commit -SB7227189 -m "untrusted on side" &&
|
||||
|
||||
git checkout master
|
||||
'
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ test_expect_success setup '
|
|||
cat one >uno &&
|
||||
mv two dos &&
|
||||
cat one >>tres &&
|
||||
echo DEF >>mouse
|
||||
echo DEF >>mouse &&
|
||||
git add uno dos tres mouse &&
|
||||
test_tick &&
|
||||
GIT_AUTHOR_NAME=Second git commit -a -m Second &&
|
||||
|
|
@ -153,15 +153,15 @@ test_expect_success 'blame path that used to be a directory' '
|
|||
'
|
||||
|
||||
test_expect_success 'blame to a commit with no author name' '
|
||||
TREE=`git rev-parse HEAD:`
|
||||
cat >badcommit <<EOF
|
||||
TREE=`git rev-parse HEAD:` &&
|
||||
cat >badcommit <<EOF &&
|
||||
tree $TREE
|
||||
author <noname> 1234567890 +0000
|
||||
committer David Reiss <dreiss@facebook.com> 1234567890 +0000
|
||||
|
||||
some message
|
||||
EOF
|
||||
COMMIT=`git hash-object -t commit -w badcommit`
|
||||
COMMIT=`git hash-object -t commit -w badcommit` &&
|
||||
git --no-pager blame $COMMIT -- uno >/dev/null
|
||||
'
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ test_description='blame output in various formats on a simple case'
|
|||
|
||||
test_expect_success 'setup' '
|
||||
echo a >file &&
|
||||
git add file
|
||||
git add file &&
|
||||
test_tick &&
|
||||
git commit -m one &&
|
||||
echo b >>file &&
|
||||
|
|
|
|||
|
|
@ -1325,7 +1325,7 @@ test_expect_success $PREREQ 'sendemail.transferencoding=7bit fails on 8bit data'
|
|||
|
||||
test_expect_success $PREREQ '--transfer-encoding overrides sendemail.transferEncoding' '
|
||||
clean_fake_sendmail &&
|
||||
git config sendemail.transferEncoding 8bit
|
||||
git config sendemail.transferEncoding 8bit &&
|
||||
test_must_fail git send-email \
|
||||
--transfer-encoding=7bit \
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
|
|
|
|||
|
|
@ -1132,7 +1132,7 @@ test_expect_success \
|
|||
compare_diff_raw expect actual'
|
||||
|
||||
test_expect_success PIPE 'N: read and copy directory' '
|
||||
cat >expect <<-\EOF
|
||||
cat >expect <<-\EOF &&
|
||||
:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
|
||||
:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ test_expect_success 'setup incomplete lines' '
|
|||
echo "Dominus regit me," >file &&
|
||||
echo "incomplete line" | tr -d "\\012" >>file &&
|
||||
git commit -a -m "Change incomplete line" &&
|
||||
git tag incomplete_lines_chg
|
||||
git tag incomplete_lines_chg &&
|
||||
echo "Dominus regit me," >file &&
|
||||
git commit -a -m "Remove incomplete line" &&
|
||||
git tag incomplete_lines_rem
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ test_expect_success 'prompt - inside bare repository' '
|
|||
'
|
||||
|
||||
test_expect_success 'prompt - interactive rebase' '
|
||||
printf " (b1|REBASE-i 2/3)" >expected
|
||||
printf " (b1|REBASE-i 2/3)" >expected &&
|
||||
write_script fake_editor.sh <<-\EOF &&
|
||||
echo "exec echo" >"$1"
|
||||
echo "edit $(git log -1 --format="%h")" >>"$1"
|
||||
|
|
|
|||
Loading…
Reference in a new issue