Merge bitcoin/bitcoin#29461: ci: avoid running git diff after patching

84388c942c ci: avoid running git diff after patching (Ryan Ofsky)

Pull request description:

  Drop `git diff` command so it is easier to run CI locally if git checkout is a worktree. Currently it fails because the directory is not recognized as a git repository.

  The `git diff` command was added recently in #28359 commit fa07ac48d8 and can be avoided just by teeing the patch to stdout

ACKs for top commit:
  maflcko:
    lgtm ACK 84388c942c
  TheCharlatan:
    ACK 84388c942c

Tree-SHA512: 089c8ff62f9c56a1df06686e72420a9a54a079d2ef9eaf7c9cfcd97cb5cce50c8c169890e599ef875aaf1ee426f590851b1f19d6c9e386671460ee6507d8d872
This commit is contained in:
fanquake 2024-02-26 10:25:28 +00:00
commit bd1c66f3a8
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1

View file

@ -36,8 +36,8 @@ export HOST=${HOST:-$("$BASE_ROOT_DIR/depends/config.guess")}
# CI, so as a temporary minimal fix to work around UB and CI failures, leave
# bytes_written unmodified.
# See https://github.com/bitcoin/bitcoin/pull/28359#issuecomment-1698694748
echo 'diff --git a/src/leveldb/db/db_impl.cc b/src/leveldb/db/db_impl.cc
index 65e31724bc..f61b471953 100644
# Tee patch to stdout to make it clear CI is testing modified code.
tee >(patch -p1) <<'EOF'
--- a/src/leveldb/db/db_impl.cc
+++ b/src/leveldb/db/db_impl.cc
@@ -1028,9 +1028,6 @@ Status DBImpl::DoCompactionWork(CompactionState* compact) {
@ -49,8 +49,8 @@ index 65e31724bc..f61b471953 100644
- }
mutex_.Lock();
stats_[compact->compaction->level() + 1].Add(stats);' | patch -p1
git diff
stats_[compact->compaction->level() + 1].Add(stats);
EOF
)
if [ "$RUN_FUZZ_TESTS" = "true" ]; then