Bugfix: Only use git for build info if the repository is actually the right one #18902

pull luke-jr wants to merge 4 commits into bitcoin:master from luke-jr:fix_gitdir_again changing 6 files +61 −14
  1. luke-jr commented at 1:47 AM on May 7, 2020: member

    Fixes using unrelated git repos again, after the fix in #7522 was unexplicably removed by #18556

    Also (really) fixes the "build version hack" (#18349) by embedding the correct tag in the release genbuild.sh

    Based on top of #18818 to avoid unnecessary conflicts/rebasing once that's merged

  2. fanquake added the label Build system on May 7, 2020
  3. DrahtBot commented at 9:34 AM on May 7, 2020: contributor

    <!--e57a25ab6845829454e8d69fc972939a-->

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    <!--174a7506f384e20aa4161008e828411d-->

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #21036 (gitian: Bump descriptors to Focal for 22.0 by fanquake)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  4. DrahtBot cross-referenced this on May 7, 2020 from issue refactor: Cleanup clientversion.cpp by hebasto
  5. luke-jr cross-referenced this on May 7, 2020 from issue Fix release tarball generated by gitian by luke-jr
  6. MarcoFalke added the label Needs gitian build on May 7, 2020
  7. MarcoFalke added the label Needs Guix build on May 7, 2020
  8. luke-jr referenced this in commit c17428643f on May 7, 2020
  9. luke-jr referenced this in commit 117c280867 on May 7, 2020
  10. luke-jr referenced this in commit 1c525e91b3 on May 7, 2020
  11. luke-jr referenced this in commit e46e063562 on May 7, 2020
  12. luke-jr cross-referenced this on May 7, 2020 from issue [0.20] Fix release tarball by luke-jr
  13. DrahtBot removed the label Needs gitian build on May 8, 2020
  14. DrahtBot removed the label Needs Guix build on May 9, 2020
  15. DrahtBot added the label Needs rebase on May 13, 2020
  16. luke-jr referenced this in commit eee88e3356 on May 14, 2020
  17. luke-jr referenced this in commit f9232da7ea on May 14, 2020
  18. luke-jr cross-referenced this on May 14, 2020 from issue [0.20] Final backports for rc2 by fanquake
  19. hebasto cross-referenced this on May 15, 2020 from issue build: Decouple clientversion.cpp from the git repo by hebasto
  20. luke-jr force-pushed on Oct 12, 2020
  21. DrahtBot removed the label Needs rebase on Oct 12, 2020
  22. DrahtBot cross-referenced this on Oct 12, 2020 from issue depends: Properly pass $PATH to configure and pin by dongcarl
  23. DrahtBot cross-referenced this on Nov 5, 2020 from issue build: Ensure source tarball has leading directory name by MarcoFalke
  24. DrahtBot added the label Needs rebase on Nov 9, 2020
  25. bitcoin deleted a comment on Nov 9, 2020
  26. bitcoin deleted a comment on Nov 9, 2020
  27. build: Abstract release tarball generation to a utility script make_release_tarball 827b1b61c9
  28. build: Run autogen & distclean when generating source tarball 1a606ef885
  29. Bugfix: Only use git for build info if the repository is actually the right one
    Original-Github-Pull: #7522
Rebased-From: e98e3dde6a976a2c8f266ee963d6931fd4b37262 e98e3dde6a976a2c8f266ee963d6931fd4b37262
    4ea29f2e88
  30. build: Include tag name in release tarball for build.h e09ae1176b
  31. luke-jr force-pushed on Nov 13, 2020
  32. luke-jr force-pushed on Nov 13, 2020
  33. luke-jr force-pushed on Nov 13, 2020
  34. DrahtBot removed the label Needs rebase on Nov 13, 2020
  35. DrahtBot cross-referenced this on Feb 4, 2021 from issue gitian: Bump descriptors to Focal for 22.0 by fanquake
  36. DrahtBot added the label Needs rebase on Feb 8, 2021
  37. DrahtBot commented at 11:56 AM on February 8, 2021: contributor

    <!--cf906140f33d8803c4a75a2196329ecb-->

    🐙 This pull request conflicts with the target branch and needs rebase.

    <sub>Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".</sub>

  38. luke-jr cross-referenced this on Sep 12, 2021 from issue build: Treat obj/build.h as an intermediate file by hebasto
  39. MarcoFalke commented at 12:00 PM on October 22, 2021: member

    Closing for now. This needs rebase and there hasn't been any activity for months.

    You can leave a comment if you want this to be reopened. (Or create a new pull, since there haven't been any comments here). Though, please make sure the code is passing tests and is ready for review.

  40. MarcoFalke closed this on Oct 22, 2021
  41. bitcoin locked this on Oct 30, 2022
Contributors
luke-jrDrahtBotMarcoFalke
Labels
Build systemNeeds rebase
Linked (view graph)
#7522 Bugfix: Only use git for build info if the repository is actually the right one#18349 build: Fix quick hack for version string in releases#18556 build: Drop make dist in gitian builds#18818 Fix release tarball generated by gitian#18909 [0.20] Fix release tarball#18973 [0.20] Final backports for rc2#18980 build: Decouple clientversion.cpp from the git repo#22624 build: Treat obj/build.h as an intermediate file
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-05-20 06:54 UTC