Merge pull request #5282 from bk2204/negated-grep

t: avoid incorrect negated commands

Author: bk2204

t/t-attributes.sh

@@ -34,7 +34,8 @@ begin_test "macros"
 
   cd dir
   git lfs track '*.bin' 2>&1 | tee track.log
-  ! grep '"*.bin" already supported' track.log
+  grep '"*.bin" already supported' track.log && exit 1
+  true
 
   # NOTE: At present we do not test that "git lfs track" reports
   #       "already supported" when it finds a pattern in a subdirectory's

t/t-checkout.sh

@@ -49,7 +49,7 @@ begin_test "checkout"
   [ "$contents" = "$(cat folder2/nested.dat)" ]
   grep "Checking out LFS objects: 100% (5/5), 95 B" checkout.log
   grep 'accepting "file1.dat"' checkout.log
-  ! grep 'rejecting "file1.dat"' checkout.log
+  grep 'rejecting "file1.dat"' checkout.log && exit 1
 
   # Remove the working directory
   rm -rf file1.dat file2.dat file3.dat folder1/nested.dat folder2/nested.dat
@@ -231,7 +231,7 @@ begin_test "checkout: conflicts"
     git commit -m "second"
 
     # This will cause a conflict.
-    ! git merge first
+    git merge first && exit 1
 
     git lfs checkout --to base.txt --base file1.dat
     git lfs checkout --to ours.txt --ours file1.dat

t/t-fetch.sh

@@ -95,7 +95,7 @@ begin_test "fetch (shared repository)"
   rm -rf .git/lfs/objects
 
   git lfs fetch 2>&1 | tee fetch.log
-  ! grep "Could not scan" fetch.log
+  grep "Could not scan" fetch.log && exit 1
   assert_local_object "$contents_oid" 1
 
   git lfs fsck 2>&1 | tee fsck.log

t/t-migrate-import.sh

@@ -846,7 +846,7 @@ begin_test "migrate import (--everything with tag pointing to tag)"
   assert_pointer "refs/heads/my-feature" "a.md" "$md_feature_oid" "30"
 
   git tag --points-at refs/tags/abc | grep -q def
-  ! git tag --points-at refs/tags/def | grep -q abc
+  git tag --points-at refs/tags/def | grep -q abc && exit 1
 
   assert_local_object "$md_main_oid" "140"
   assert_local_object "$md_feature_oid" "30"

t/t-post-commit.sh

@@ -101,6 +101,7 @@ begin_test "post-commit does not enter submodules"
 
   git add *.dat
   GIT_TRACE=1 git commit -m "Committed large files" 2>&1 | tee output
-  ! grep -E 'filepathfilter:.*submodule/foo' output
+  grep -E 'filepathfilter:.*submodule/foo' output && exit 1
+  true
 )
 end_test

t/t-pre-push.sh

@@ -1216,7 +1216,8 @@ begin_test "pre-push with pushDefault and explicit remote"
   GIT_TRACE=1 GIT_TRANSFER_TRACE=1 git push origin main 2>&1 | tee push.log
 
   assert_server_object "$reponame" 98ea6e4f216f2fb4b69fff9b3a44842c38686ca685f3f55dc48c5d3fb1107be4 "refs/heads/main"
-  ! grep wrong-url push.log
+  grep wrong-url push.log && exit 1
+  true
 )
 end_test
 
@@ -1280,7 +1281,8 @@ begin_test "pre-push does not traverse Git objects server has"
   # Verify that we haven't tried to push or query for the object we already
   # pushed before; i.e., we didn't see it because we ignored its Git object
   # during traversal.
-  ! grep $contents_oid push.log
+  grep $contents_oid push.log && exit 1
+  true
 )
 end_test
 

t/t-standalone-file.sh

@@ -455,7 +455,7 @@ begin_test "standalone-file-lfs.url http URL"
   [ ${PIPESTATUS[0]} = "0" ]
 
   # We should not use the custom adapter process here.
-  ! grep "xfer: started custom adapter process" push.log
+  grep "xfer: started custom adapter process" push.log && exit 1
   grep -F "$GITSERVER/$reponame" push.log
 
   # Make sure we didn't write to the wrong repo.
@@ -465,7 +465,7 @@ begin_test "standalone-file-lfs.url http URL"
   rm -fr .git/lfs/objects
 
   GIT_TRACE=1 GIT_TRANSFER_TRACE=1 git lfs fetch --all 2>&1 | tee fetch.log
-  ! grep "xfer: started custom adapter process" fetch.log
+  grep "xfer: started custom adapter process" fetch.log && exit 1
   grep -F "$GITSERVER/$reponame" fetch.log
 
   git lfs fsck

t/t-track.sh

@@ -74,7 +74,8 @@ begin_test "track --no-excluded"
   echo "*.mov -filter=lfs -text" >> a/b/.gitattributes
 
   git lfs track --no-excluded | tee track.log
-  ! grep "Listing excluded patterns" track.log
+  grep "Listing excluded patterns" track.log && exit 1
+  true
 )
 end_test