Fix .gitignore for src/test/fuzz directory #19595

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:200727-fuzz changing 1 files +1 −1
  1. hebasto commented at 10:00 PM on July 26, 2020: member

    On master (31d2b4098a9e4ee9a694ba1ad42829637cbcf3c6):

    $ git ls-files --ignored --exclude-standard
    contrib/init/org.bitcoin.bitcoind.plist
    contrib/macdeploy/fancy.plist
    src/qt/Makefile
    src/qt/test/Makefile
    src/test/Makefile
    src/test/fuzz/FuzzedDataProvider.h
    src/test/fuzz/addition_overflow.cpp
    src/test/fuzz/addrdb.cpp
    src/test/fuzz/asmap.cpp
    src/test/fuzz/asmap_direct.cpp
    src/test/fuzz/autofile.cpp
    src/test/fuzz/banman.cpp
    src/test/fuzz/base_encode_decode.cpp
    src/test/fuzz/bech32.cpp
    src/test/fuzz/block.cpp
    src/test/fuzz/block_header.cpp
    src/test/fuzz/blockfilter.cpp
    src/test/fuzz/bloom_filter.cpp
    src/test/fuzz/buffered_file.cpp
    src/test/fuzz/chain.cpp
    src/test/fuzz/checkqueue.cpp
    src/test/fuzz/coins_view.cpp
    src/test/fuzz/crypto.cpp
    src/test/fuzz/crypto_aes256.cpp
    src/test/fuzz/crypto_aes256cbc.cpp
    src/test/fuzz/crypto_chacha20.cpp
    src/test/fuzz/crypto_chacha20_poly1305_aead.cpp
    src/test/fuzz/crypto_common.cpp
    src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp
    src/test/fuzz/crypto_poly1305.cpp
    src/test/fuzz/cuckoocache.cpp
    src/test/fuzz/decode_tx.cpp
    src/test/fuzz/descriptor_parse.cpp
    src/test/fuzz/deserialize.cpp
    src/test/fuzz/eval_script.cpp
    src/test/fuzz/fee_rate.cpp
    src/test/fuzz/fees.cpp
    src/test/fuzz/flatfile.cpp
    src/test/fuzz/float.cpp
    src/test/fuzz/fuzz.cpp
    src/test/fuzz/fuzz.h
    src/test/fuzz/golomb_rice.cpp
    src/test/fuzz/hex.cpp
    src/test/fuzz/http_request.cpp
    src/test/fuzz/integer.cpp
    src/test/fuzz/key.cpp
    src/test/fuzz/key_io.cpp
    src/test/fuzz/kitchen_sink.cpp
    src/test/fuzz/load_external_block_file.cpp
    src/test/fuzz/locale.cpp
    src/test/fuzz/merkleblock.cpp
    src/test/fuzz/message.cpp
    src/test/fuzz/multiplication_overflow.cpp
    src/test/fuzz/net_permissions.cpp
    src/test/fuzz/netaddress.cpp
    src/test/fuzz/p2p_transport_deserializer.cpp
    src/test/fuzz/parse_hd_keypath.cpp
    src/test/fuzz/parse_iso8601.cpp
    src/test/fuzz/parse_numbers.cpp
    src/test/fuzz/parse_script.cpp
    src/test/fuzz/parse_univalue.cpp
    src/test/fuzz/policy_estimator.cpp
    src/test/fuzz/policy_estimator_io.cpp
    src/test/fuzz/pow.cpp
    src/test/fuzz/prevector.cpp
    src/test/fuzz/primitives_transaction.cpp
    src/test/fuzz/process_message.cpp
    src/test/fuzz/process_messages.cpp
    src/test/fuzz/protocol.cpp
    src/test/fuzz/psbt.cpp
    src/test/fuzz/random.cpp
    src/test/fuzz/rbf.cpp
    src/test/fuzz/rolling_bloom_filter.cpp
    src/test/fuzz/script.cpp
    src/test/fuzz/script_bitcoin_consensus.cpp
    src/test/fuzz/script_descriptor_cache.cpp
    src/test/fuzz/script_flags.cpp
    src/test/fuzz/script_interpreter.cpp
    src/test/fuzz/script_ops.cpp
    src/test/fuzz/script_sigcache.cpp
    src/test/fuzz/script_sign.cpp
    src/test/fuzz/scriptnum_ops.cpp
    src/test/fuzz/signature_checker.cpp
    src/test/fuzz/span.cpp
    src/test/fuzz/spanparsing.cpp
    src/test/fuzz/string.cpp
    src/test/fuzz/strprintf.cpp
    src/test/fuzz/system.cpp
    src/test/fuzz/timedata.cpp
    src/test/fuzz/transaction.cpp
    src/test/fuzz/tx_in.cpp
    src/test/fuzz/tx_out.cpp
    src/test/fuzz/util.h
    src/univalue/gen/gen.cpp
    test/functional/data/wallets/high_minversion/db.log
    test/functional/data/wallets/high_minversion/wallet.dat
    

    With this PR:

    $ git ls-files --ignored --exclude-standard
    contrib/init/org.bitcoin.bitcoind.plist
    contrib/macdeploy/fancy.plist
    src/qt/Makefile
    src/qt/test/Makefile
    src/test/Makefile
    src/univalue/gen/gen.cpp
    test/functional/data/wallets/high_minversion/db.log
    test/functional/data/wallets/high_minversion/wallet.dat
    
  2. Fix .gitignore for src/test/fuzz directory 623f66554d
  3. hebasto commented at 10:00 PM on July 26, 2020: member
  4. theStack approved
  5. theStack commented at 10:37 PM on July 26, 2020: member

    tested ACK 623f66554d44611485fa14937b6fd4f1dc63b818 (creating a file with extension in src/test/fuzz wouldn't show up on git status on the master branch, on the PR branch it does)

  6. practicalswift commented at 11:17 PM on July 26, 2020: contributor

    ACK 623f66554d44611485fa14937b6fd4f1dc63b818 -- thanks for fixing! ❤️

  7. in .gitignore:13 in 623f66554d
       8 | @@ -9,7 +9,7 @@ src/bitcoin-gui
       9 |  src/bitcoin-node
      10 |  src/bitcoin-tx
      11 |  src/bitcoin-wallet
      12 | -src/test/fuzz
      13 | +src/test/fuzz/*
      14 |  !src/test/fuzz/*.*
    


    elichai commented at 9:06 AM on July 27, 2020:

    Aren't these two contradicting?


    MarcoFalke commented at 9:11 AM on July 27, 2020:

    The above ignores all files in the folder, but not the whole folder The below un-ignores any file with an extension (e.g. .h or .cpp files)

    Effectively, files with no extension are ignored (e.g. binary executable files), no?

  8. jonatack commented at 9:41 AM on July 27, 2020: member

    I thought this was fixed recently per #17452 to not see binary files in git status. Did an update to git change the functioning of .gitignore?

  9. hebasto commented at 10:48 AM on July 27, 2020: member

    @jonatack

    I thought this was fixed recently per #17452 to not see binary files in git status. Did an update to git change the functioning of .gitignore?

    Which git version the current master is working well with?

  10. hebasto commented at 10:51 AM on July 27, 2020: member

    https://git-scm.com/docs/gitignore:

    An optional prefix "!" which negates the pattern; any matching file excluded by a previous pattern will become included again. It is not possible to re-include a file if a parent directory of that file is excluded.

  11. jonatack commented at 11:01 AM on July 27, 2020: member

    @jonatack

    I thought this was fixed recently per #17452 to not see binary files in git status. Did an update to git change the functioning of .gitignore?

    Which git version the current master is working well with?

    The version the reviewers of that PR, also present here, were using? Anyway, no strong opinion; I didn't notice anything was broken.

  12. MarcoFalke commented at 11:08 AM on July 27, 2020: member

    I didn't notice anything was broken

    Current master, as well as this pull properly ignore the fuzz binaries, so there is nothing broken about that. The only difference should be when creating files.

  13. MarcoFalke commented at 11:08 AM on July 27, 2020: member

    review ACK 623f66554d44611485fa14937b6fd4f1dc63b818 seems like an improvement when writing new fuzz tests

  14. hebasto commented at 11:09 AM on July 27, 2020: member

    @jonatack

    I thought this was fixed recently per #17452 to not see binary files in git status. Did an update to git change the functioning of .gitignore?

    Which git version the current master is working well with?

    The version the reviewers of that PR, also present here, were using? Anyway, no strong opinion; I didn't notice anything was broken.

    On master (31d2b4098a9e4ee9a694ba1ad42829637cbcf3c6):

    $ git --version
    git version 2.25.1
    $ git status 
    On branch master
    Your branch is up to date with 'origin/master'.
    
    nothing to commit, working tree clean
    $ echo "//test" > src/test/fuzz/cpp.cpp
    $ cat src/test/fuzz/cpp.cpp 
    //test
    $ git status 
    On branch master
    Your branch is up to date with 'origin/master'.
    
    nothing to commit, working tree clean
    

    With this PR the last status command gives the correct response:

    $ git status 
    On branch 200727-fuzz
    Untracked files:
      (use "git add <file>..." to include in what will be committed)
    	src/test/fuzz/cpp.cpp
    
    nothing added to commit but untracked files present (use "git add" to track)
    
  15. jonatack commented at 11:12 AM on July 27, 2020: member

    It looks like @kallewoof had it right in https://github.com/bitcoin/bitcoin/pull/17855/files and I messed it up, then.

  16. fanquake merged this on Jul 28, 2020
  17. fanquake closed this on Jul 28, 2020

  18. hebasto deleted the branch on Jul 28, 2020
  19. sidhujag referenced this in commit b55dbd949b on Jul 28, 2020
  20. DrahtBot locked this on Feb 15, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-24 21:14 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me