devtools: Always use unabbreviated commit IDs in github-merge.py #16201
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
Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's `core.abbrev` git setting from leaking through and is better against ambiguity too.
|
ACK 067fba5 (replaces |
|
ACK 067fba5, from the documentation https://git-scm.com/docs/pretty-formats:
|
|
ACK 067fba5. Tested by merging this PR into master, then merging a second PR ontop and checking that full commit hashes were being used. Also checked documentation linked to above. Did not check that this works when a different contrib/devtools/github-merge.py 16201
[pull/16201/local-merge d9b6e6c3c] Merge #16201: devtools: Always use unabbreviated commit IDs in github-merge.py
Date: Fri Jun 14 11:14:51 2019 +0800
#16201 devtools: Always use unabbreviated commit IDs in github-merge.py into master
* 067fba563 devtools: Always use unabbreviated commit IDs in github-merge.py (Wladimir J. van der Laan) (pull/16201/head)
Dropping you on a shell so you can try building/testing the merged source.
Run 'git diff HEAD~' to show the changes being merged.
Type 'exit' when done.
bash-3.2$ contrib/devtools/github-merge.py 16202
[pull/16202/local-merge 4dac2bcb0] Merge #16202: Refactor network message deserialization
Date: Fri Jun 14 11:15:46 2019 +0800
#16202 Refactor network message deserialization into master
* 3fa744df9d8db26953b3a17520d5698f94f0cf34 Use adapter pattern for the network deserializer (Jonas Schnelli) (pull/16202/head)
* 24e58210b0dd4b7f41842deebd928104a493c2cb Remove transport protocol knowhow from CNetMessage / net processing (Jonas Schnelli)
* 2d3ae443e268d5b039d422c896f0dc6a146a1be5 Refactor: split network transport deserializing from message container (Jonas Schnelli)
Dropping you on a shell so you can try building/testing the merged source.
Run 'git diff HEAD~' to show the changes being merged.
Type 'exit' when done. |
fanquake
added a commit
that referenced
this pull request
Jun 14, 2019
…-merge.py 067fba5 devtools: Always use unabbreviated commit IDs in github-merge.py (Wladimir J. van der Laan) Pull request description: Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's `core.abbrev` git setting from leaking through and is better against ambiguity too. ACKs for commit 067fba: MarcoFalke: ACK 067fba5 (replaces `h` with `H`, didn't test) promag: ACK 067fba5, from the documentation https://git-scm.com/docs/pretty-formats: fanquake: ACK 067fba5. Tested by merging this PR into master, then merging a second PR ontop and checking that full commit hashes were being used. Also checked documentation linked to above. Did not check that this works when a different `core.abbrev` is set locally. Tree-SHA512: a851d10490cd8bcd8bca29094b08a6b9f883cfe1b0767ccda7ca789e4c8eff6260a4d82c33cb3d9bab01dd30ac8c9100cb7adbcb1911bb399d9385c1e1f15ecd
fanquake
pushed a commit
to fanquake/bitcoin
that referenced
this pull request
Jul 7, 2019
Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's `core.abbrev` git setting from leaking through and is better against ambiguity too. Github-Pull: bitcoin#16201 Rebased-From: 067fba5
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jun 27, 2021
… github-merge.py 067fba5 devtools: Always use unabbreviated commit IDs in github-merge.py (Wladimir J. van der Laan) Pull request description: Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's `core.abbrev` git setting from leaking through and is better against ambiguity too. ACKs for commit 067fba: MarcoFalke: ACK 067fba5 (replaces `h` with `H`, didn't test) promag: ACK 067fba5, from the documentation https://git-scm.com/docs/pretty-formats: fanquake: ACK bitcoin@067fba5. Tested by merging this PR into master, then merging a second PR ontop and checking that full commit hashes were being used. Also checked documentation linked to above. Did not check that this works when a different `core.abbrev` is set locally. Tree-SHA512: a851d10490cd8bcd8bca29094b08a6b9f883cfe1b0767ccda7ca789e4c8eff6260a4d82c33cb3d9bab01dd30ac8c9100cb7adbcb1911bb399d9385c1e1f15ecd
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jun 28, 2021
… github-merge.py 067fba5 devtools: Always use unabbreviated commit IDs in github-merge.py (Wladimir J. van der Laan) Pull request description: Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's `core.abbrev` git setting from leaking through and is better against ambiguity too. ACKs for commit 067fba: MarcoFalke: ACK 067fba5 (replaces `h` with `H`, didn't test) promag: ACK 067fba5, from the documentation https://git-scm.com/docs/pretty-formats: fanquake: ACK bitcoin@067fba5. Tested by merging this PR into master, then merging a second PR ontop and checking that full commit hashes were being used. Also checked documentation linked to above. Did not check that this works when a different `core.abbrev` is set locally. Tree-SHA512: a851d10490cd8bcd8bca29094b08a6b9f883cfe1b0767ccda7ca789e4c8eff6260a4d82c33cb3d9bab01dd30ac8c9100cb7adbcb1911bb399d9385c1e1f15ecd
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jun 29, 2021
… github-merge.py 067fba5 devtools: Always use unabbreviated commit IDs in github-merge.py (Wladimir J. van der Laan) Pull request description: Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's `core.abbrev` git setting from leaking through and is better against ambiguity too. ACKs for commit 067fba: MarcoFalke: ACK 067fba5 (replaces `h` with `H`, didn't test) promag: ACK 067fba5, from the documentation https://git-scm.com/docs/pretty-formats: fanquake: ACK bitcoin@067fba5. Tested by merging this PR into master, then merging a second PR ontop and checking that full commit hashes were being used. Also checked documentation linked to above. Did not check that this works when a different `core.abbrev` is set locally. Tree-SHA512: a851d10490cd8bcd8bca29094b08a6b9f883cfe1b0767ccda7ca789e4c8eff6260a4d82c33cb3d9bab01dd30ac8c9100cb7adbcb1911bb399d9385c1e1f15ecd
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jul 1, 2021
… github-merge.py 067fba5 devtools: Always use unabbreviated commit IDs in github-merge.py (Wladimir J. van der Laan) Pull request description: Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's `core.abbrev` git setting from leaking through and is better against ambiguity too. ACKs for commit 067fba: MarcoFalke: ACK 067fba5 (replaces `h` with `H`, didn't test) promag: ACK 067fba5, from the documentation https://git-scm.com/docs/pretty-formats: fanquake: ACK bitcoin@067fba5. Tested by merging this PR into master, then merging a second PR ontop and checking that full commit hashes were being used. Also checked documentation linked to above. Did not check that this works when a different `core.abbrev` is set locally. Tree-SHA512: a851d10490cd8bcd8bca29094b08a6b9f883cfe1b0767ccda7ca789e4c8eff6260a4d82c33cb3d9bab01dd30ac8c9100cb7adbcb1911bb399d9385c1e1f15ecd
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jul 1, 2021
… github-merge.py 067fba5 devtools: Always use unabbreviated commit IDs in github-merge.py (Wladimir J. van der Laan) Pull request description: Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's `core.abbrev` git setting from leaking through and is better against ambiguity too. ACKs for commit 067fba: MarcoFalke: ACK 067fba5 (replaces `h` with `H`, didn't test) promag: ACK 067fba5, from the documentation https://git-scm.com/docs/pretty-formats: fanquake: ACK bitcoin@067fba5. Tested by merging this PR into master, then merging a second PR ontop and checking that full commit hashes were being used. Also checked documentation linked to above. Did not check that this works when a different `core.abbrev` is set locally. Tree-SHA512: a851d10490cd8bcd8bca29094b08a6b9f883cfe1b0767ccda7ca789e4c8eff6260a4d82c33cb3d9bab01dd30ac8c9100cb7adbcb1911bb399d9385c1e1f15ecd
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jul 12, 2021
… github-merge.py 067fba5 devtools: Always use unabbreviated commit IDs in github-merge.py (Wladimir J. van der Laan) Pull request description: Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's `core.abbrev` git setting from leaking through and is better against ambiguity too. ACKs for commit 067fba: MarcoFalke: ACK 067fba5 (replaces `h` with `H`, didn't test) promag: ACK 067fba5, from the documentation https://git-scm.com/docs/pretty-formats: fanquake: ACK bitcoin@067fba5. Tested by merging this PR into master, then merging a second PR ontop and checking that full commit hashes were being used. Also checked documentation linked to above. Did not check that this works when a different `core.abbrev` is set locally. Tree-SHA512: a851d10490cd8bcd8bca29094b08a6b9f883cfe1b0767ccda7ca789e4c8eff6260a4d82c33cb3d9bab01dd30ac8c9100cb7adbcb1911bb399d9385c1e1f15ecd
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Always put the unabbreviated commit IDs in the generated commit messages and other places. This prevents the developer's
core.abbrevgit setting from leaking through and is better against ambiguity too.