mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'ma/test-cleanup'
Code cleanup. * ma/test-cleanup: t: drop debug `cat` calls t9810: drop debug `cat` call t4117: check for files using `test_path_is_file`
This commit is contained in:
commit
aa5a7e02ad
|
@ -795,7 +795,6 @@ test_expect_success PERL 'missing file in delayed checkout' '
|
|||
|
||||
rm -rf repo-cloned &&
|
||||
test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
|
||||
cat git-stderr.log &&
|
||||
grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log
|
||||
'
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ test_expect_success 'for_each_reflog()' '
|
|||
'
|
||||
|
||||
test_expect_success 'for_each_reflog_ent()' '
|
||||
$RUN for-each-reflog-ent HEAD >actual && cat actual &&
|
||||
$RUN for-each-reflog-ent HEAD >actual &&
|
||||
head -n1 actual | grep first &&
|
||||
tail -n2 actual | head -n1 | grep master.to.new
|
||||
'
|
||||
|
|
|
@ -141,7 +141,6 @@ test_expect_success 'email without @ is okay' '
|
|||
git update-ref refs/heads/bogus "$new" &&
|
||||
test_when_finished "git update-ref -d refs/heads/bogus" &&
|
||||
git fsck 2>out &&
|
||||
cat out &&
|
||||
! grep "commit $new" out
|
||||
'
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ Tests for command-line parsing and basic operation.
|
|||
|
||||
test_expect_success 'update-index --nonsense fails' '
|
||||
test_must_fail git update-index --nonsense 2>msg &&
|
||||
cat msg &&
|
||||
test -s msg
|
||||
'
|
||||
|
||||
|
|
|
@ -130,7 +130,6 @@ test_expect_success '--recurse-submodules and pathspecs setup' '
|
|||
|
||||
git ls-files --recurse-submodules >actual &&
|
||||
test_cmp expect actual &&
|
||||
cat actual &&
|
||||
git ls-files --recurse-submodules "*" >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
|
|
@ -74,7 +74,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
|
|||
test_must_fail git apply --reject patch.1 &&
|
||||
test_cmp expected file1 &&
|
||||
|
||||
cat file1.rej &&
|
||||
test_path_is_file file1.rej &&
|
||||
test_path_is_missing file2.rej
|
||||
'
|
||||
|
||||
|
@ -87,7 +87,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
|
|||
test_path_is_missing file1 &&
|
||||
test_cmp expected file2 &&
|
||||
|
||||
cat file2.rej &&
|
||||
test_path_is_file file2.rej &&
|
||||
test_path_is_missing file1.rej
|
||||
|
||||
'
|
||||
|
@ -101,7 +101,7 @@ test_expect_success 'the same test with --verbose' '
|
|||
test_path_is_missing file1 &&
|
||||
test_cmp expected file2 &&
|
||||
|
||||
cat file2.rej &&
|
||||
test_path_is_file file2.rej &&
|
||||
test_path_is_missing file1.rej
|
||||
|
||||
'
|
||||
|
|
|
@ -150,7 +150,6 @@ test_expect_success 'pull request after push' '
|
|||
git request-pull initial origin master:for-upstream >../request
|
||||
) &&
|
||||
sed -nf read-request.sed <request >digest &&
|
||||
cat digest &&
|
||||
{
|
||||
read task &&
|
||||
read repository &&
|
||||
|
@ -179,7 +178,6 @@ test_expect_success 'request asks HEAD to be pulled' '
|
|||
git request-pull initial "$downstream_url" >../request
|
||||
) &&
|
||||
sed -nf read-request.sed <request >digest &&
|
||||
cat digest &&
|
||||
{
|
||||
read task &&
|
||||
read repository &&
|
||||
|
|
|
@ -56,14 +56,13 @@ test_expect_success 'short line' '
|
|||
|
||||
test_expect_success 'case-insensitive' '
|
||||
git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output &&
|
||||
cat output &&
|
||||
test_decode_color <output >decoded &&
|
||||
grep "<BOLD;RED>error<RESET>: error" decoded &&
|
||||
grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded
|
||||
'
|
||||
|
||||
test_expect_success 'leading space' '
|
||||
git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output && cat output &&
|
||||
git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&
|
||||
test_decode_color <output >decoded &&
|
||||
grep " <BOLD;RED>error<RESET>: leading space" decoded
|
||||
'
|
||||
|
|
|
@ -379,7 +379,6 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge
|
|||
# the strange name is: a\!'b
|
||||
test_expect_success 'quoting of a strangely named repo' '
|
||||
test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
|
||||
cat result &&
|
||||
grep "fatal: '\''a\\\\!'\''b'\''" result
|
||||
'
|
||||
|
||||
|
|
|
@ -173,7 +173,6 @@ test_expect_success 'blame during cherry-pick with file rename conflict' '
|
|||
git show HEAD@{1}:rodent > rodent &&
|
||||
git add rodent &&
|
||||
git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
|
||||
cat current &&
|
||||
cat >expected <<-\EOF &&
|
||||
mouse-Initial
|
||||
mouse-Second
|
||||
|
|
|
@ -1047,7 +1047,6 @@ test_expect_success 'M: rename root to subdirectory' '
|
|||
EOF
|
||||
git fast-import <input &&
|
||||
git diff-tree -M -r M4^ M4 >actual &&
|
||||
cat actual &&
|
||||
compare_diff_raw expect actual
|
||||
'
|
||||
|
||||
|
|
|
@ -202,7 +202,6 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
|
|||
export PATH &&
|
||||
test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
|
||||
) &&
|
||||
cat errs &&
|
||||
test_i18ngrep ! Traceback errs
|
||||
'
|
||||
|
||||
|
|
|
@ -294,7 +294,6 @@ test_expect_success 'cope with rcs keyword file deletion' '
|
|||
echo "\$Revision\$" >kwdelfile.c &&
|
||||
p4 add -t ktext kwdelfile.c &&
|
||||
p4 submit -d "Add file to be deleted" &&
|
||||
cat kwdelfile.c &&
|
||||
grep 1 kwdelfile.c
|
||||
) &&
|
||||
git p4 clone --dest="$git" //depot &&
|
||||
|
|
Loading…
Reference in a new issue