[Gitian][Bug] Ignore changes to relic_conf.h.in #2541
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
furszy
approved these changes
Sep 8, 2021
furszy
referenced
this pull request
in furszy/bitcoin-core
Sep 17, 2021
Github-Pull: bitcoin#2541 Rebased-From: 5eb2083
furszy
referenced
this pull request
in furszy/bitcoin-core
Sep 19, 2021
Github-Pull: bitcoin#2541 Rebased-From: 5eb2083
Fuzzbawls
added a commit
that referenced
this pull request
Sep 21, 2021
2981a17 GUI: Remove unused, and invalid, cached QR pixmap pointer. (furszy) 798c3e9 GUI: addresses widget files overall code cleanup. (furszy) 51f6555 GUI: fix contacts list not being shown. (furszy) 5be181a [Consensus] Add checkpoints before v5.3.1 release Github-Pull: #2562 Rebased-From: e8fddd7 (random-zebra) 17fa0eb Masternode-sync: Only mark tier two messages sync requests as fulfilled if the messages are broadcast. e.g: do not mark them as fulfilled before fail for a timeout. (furszy) 2f98acf [BUG][GUI] Fix random double/triple transaction record issue (random-zebra) 754177e [BUG][TierTwo] Clear fulfilled requests when mnsync fails (random-zebra) 5a2e0d1 [Trivial] Update labelSubtitleAddress text in send widget ui Github-Pull: #2557 Rebased-From: efddb3b (random-zebra) 09b8ec0 [BUG] Spork signer doesn't persist new spork value to DB Github-Pull: #2553 Rebased-From: 5849e3e (random-zebra) 7f827e9 [Snap] Fix nightly build's genbuild.sh patch (Fuzzbawls) 24a1407 [Gitian] Ignore changes to relic_conf.h.in (Fuzzbawls) b400640 Update manpages to reflect newer template (Fuzzbawls) ecdbf86 [Docs] Reformat -help output for help2man (Fuzzbawls) 656be59 Run make translate to update source files (Fuzzbawls) cd8d0b5 Stop translating command line options (Fuzzbawls) 004efe9 Stop translating remaining usages of PACKAGE_NAME (Fuzzbawls) 67e7938 Unify product name to as few places as possible (Fuzzbawls) 4fe9030 [RPC][Doc] Fix RPC/cli example in setautocombinethreshold help (random-zebra) 5f9aac4 Refactor: remove duplicated coll. confirmation check in MNModel::data Github-Pull: #2530 Rebased-From: f0fd8ac (random-zebra) 2a947c0 build: Get rid of `CLIENT_DATE` (Wladimir J. van der Laan) 51fca36 [Qt] Debug window: remove "Build date". (furszy) d223d90 build: Remove src/obj directory from repository (Wladimir J. van der Laan) Pull request description: PRs List: * #2525. * #2530. * #2540. * #2491. * #2541. * #2546. * #2553. * #2557. * #2559. Open PRs that have to get merged to be added here: * * [x] #2560. * * [x] #2555. * * [x] #2551. * * [x] #2562. ACKs for top commit: random-zebra: ACK 2981a17 Fuzzbawls: ACK 2981a17 Tree-SHA512: 400c6cd5c05c99b79c67cb0158048315f33d18a49c9606ad668727b6534c84bbbc8617eb7759b9b6fb230f8fb8b94e74902d03e1579b23b3e84d063ec7a142fa
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This file gets overwritten during the autotools build process, but we don't actually want to track changes to it in our repo.
Currently, gitian builds will see that this file has changes, and thus mark the build as "dirty". This PR tells gitian builds to ignore any changes to the file via
update-index --assume-unchangedso that release versions are no longer marked as "dirty".