Skip to content
Bitcoin Core integration/staging tree
Branch: master
Clone or download
MarcoFalke Merge #16223: devtools: Fetch and display ACKs at sign-off time in gi…
…thub-merge

0e01e45 devtools: Fetch and display ACKs at sign-off time in github-merge (Wladimir J. van der Laan)

Pull request description:

  - Fetch the ACKs only at sign-off time. This makes sure that any last-minute ACKs are included (fixes #16200)
  - Show a list of ACKs that will be included and their author before signing off, and warn if there are none

  ![1](https://user-images.githubusercontent.com/126646/59605250-ad070980-910e-11e9-9f9a-d789c7f06ebb.png)
  ![2](https://user-images.githubusercontent.com/126646/59605255-b1332700-910e-11e9-80a5-d1e244f48264.png)

  There's a slight change to the merge commit format—before it was
  ```
      ACKs for commit 88884c:
  (list of ACKs, could be empty)
  ```
  now it is
  ```
  ACKs for top commit:
        jnewbery:
          ACK 5ebc6b0
      ... (list of ACKs cannot be empty)
  ```
  or
  ```
  Top commit has no ACKs.
  ```
  I don't think there's a reason to have the abbreviated commit ID there, after all the full commit id is already in the beginning of the merge commit message, and at least the abbreviated one is in every single ACK message.

ACKs for commit 0e01e4:
  fanquake:
    ACK 0e01e45

Tree-SHA512: 8576de016137d71cfc101747e9bb6779c13e0953cf2babee7afc9972bf2bd46f6912be4982b54fa5abf4d91e98e8fdae6b4ca3eef7d6892b7a5f04a7017b6882
Latest commit e115a21 Jun 24, 2019
Permalink
Type Name Latest commit message Commit time
Failed to load latest commit information.
.github Get more info about GUI-related issue on Linux Dec 27, 2018
.travis Merge #16186: doc/lint: Fix spelling errors identified by codespell 1… Jun 16, 2019
.tx qt: Pre-0.18 split-off translations update Feb 4, 2019
build-aux/m4 [depends] boost: update to 1.70 May 3, 2019
build_msvc MSVC: Fix error in debug mode (Fix #16245) Jun 20, 2019
contrib Merge #16223: devtools: Fetch and display ACKs at sign-off time in gi… Jun 24, 2019
depends Merge #15461: [depends] update to Boost 1.70 Jun 6, 2019
doc Merge #16239: wallet/rpc: follow-up clean-up/fixes to avoid_reuse Jun 22, 2019
share Merge #15548: build: use full version string in setup.exe Mar 12, 2019
src Merge #16254: qt: Set AA_EnableHighDpiScaling attribute early Jun 24, 2019
test Merge #16239: wallet/rpc: follow-up clean-up/fixes to avoid_reuse Jun 22, 2019
.appveyor.yml appveyor: Write @PACKAGE_NAME@ to config Apr 26, 2019
.cirrus.yml ci: Run extended tests Jun 20, 2019
.gitattributes Separate protocol versioning from clientversion Oct 29, 2014
.gitignore .gitignore: Don't ignore depends patches May 8, 2019
.python-version .python-version: Specify full version 3.5.6 Mar 2, 2019
.style.yapf test: .style.yapf: Set column_limit=160 Mar 4, 2019
.travis.yml travis: Use absolute paths for cache dirs Jun 14, 2019
CONTRIBUTING.md doc: Rework section on ACK Jun 13, 2019
COPYING [Trivial] Update license year range to 2019 Dec 31, 2018
INSTALL.md Update INSTALL landing redirection notice for build instructions. Oct 5, 2016
Makefile.am Failing functional tests stop lcov Jun 13, 2019
README.md doc: Remove travis badge from readme Jun 19, 2019
SECURITY.md doc: Remove explicit mention of version from SECURITY.md Jun 14, 2019
autogen.sh Add "export LC_ALL=C" to all shell scripts Jun 14, 2018
configure.ac configure: Add flag for enabling thread_local. May 23, 2019
libbitcoinconsensus.pc.in Unify package name to as few places as possible without major changes Dec 14, 2015

README.md

Bitcoin Core integration/staging tree

https://bitcoincore.org

What is Bitcoin?

Bitcoin is an experimental digital currency that enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Bitcoin Core is the name of open source software which enables the use of this currency.

For more information, as well as an immediately useable, binary version of the Bitcoin Core software, see https://bitcoincore.org/en/download/, or read the original whitepaper.

License

Bitcoin Core is released under the terms of the MIT license. See COPYING for more information or see https://opensource.org/licenses/MIT.

Development Process

The master branch is regularly built and tested, but is not guaranteed to be completely stable. Tags are created regularly to indicate new official, stable release versions of Bitcoin Core.

The contribution workflow is described in CONTRIBUTING.md and useful hints for developers can be found in doc/developer-notes.md.

Testing

Testing and code review is the bottleneck for development; we get more pull requests than we can review and test on short notice. Please be patient and help out by testing other people's pull requests, and remember this is a security-critical project where any mistake might cost people lots of money.

Automated Testing

Developers are strongly encouraged to write unit tests for new code, and to submit new unit tests for old code. Unit tests can be compiled and run (assuming they weren't disabled in configure) with: make check. Further details on running and extending unit tests can be found in /src/test/README.md.

There are also regression and integration tests, written in Python, that are run automatically on the build server. These tests can be run (if the test dependencies are installed) with: test/functional/test_runner.py

The Travis CI system makes sure that every pull request is built for Windows, Linux, and macOS, and that unit/sanity tests are run automatically.

Manual Quality Assurance (QA) Testing

Changes should be tested by somebody other than the developer who wrote the code. This is especially important for large or high-risk changes. It is useful to add a test plan to the pull request description if testing the changes is not straightforward.

Translations

Changes to translations as well as new translations can be submitted to Bitcoin Core's Transifex page.

Translations are periodically pulled from Transifex and merged into the git repository. See the translation process for details on how this works.

Important: We do not accept translation changes as GitHub pull requests because the next pull from Transifex would automatically overwrite them again.

Translators should also subscribe to the mailing list.

You can’t perform that action at this time.