Skip to content

Adjust .gitignore for moved file#339

Closed
l0rinc wants to merge 1 commit into
hebasto:cmake-stagingfrom
l0rinc:l0rinc/gitignore
Closed

Adjust .gitignore for moved file#339
l0rinc wants to merge 1 commit into
hebasto:cmake-stagingfrom
l0rinc:l0rinc/gitignore

Conversation

@l0rinc
Copy link
Copy Markdown

@l0rinc l0rinc commented Aug 18, 2024

Split out of bitcoin#30454

Removed bitcoin-config.h.in from .gitignore since it's not generated anymore

@l0rinc l0rinc marked this pull request as ready for review August 18, 2024 19:34
@l0rinc l0rinc changed the title Adjust .gitignore for moved files Adjust .gitignore for moved file Aug 18, 2024
@hebasto
Copy link
Copy Markdown
Owner

hebasto commented Aug 19, 2024

Adjust .gitignore entry for bitcoin-config.h.in, moved in https://github.com/bitcoin/bitcoin/blob/c360837ca5c91c9878ae8088bb5482e96fd87c96/test/lint/test_runner/src/main.rs#L321

When using Autotools, bitcoin-config.h.in is generated:

bitcoin/src/Makefile.am

Lines 1039 to 1040 in 818a3c0

$(top_srcdir)/$(subdir)/config/bitcoin-config.h.in: $(am__configure_deps)
$(AM_V_at)$(MAKE) -C $(top_srcdir) $(subdir)/config/bitcoin-config.h.in

However, bitcoin-config.h.in is a part of the source code in the cmake-staging branch and shouldn't be ignored by git.

@l0rinc
Copy link
Copy Markdown
Author

l0rinc commented Aug 19, 2024

Had a suspicion that was the case - updated to remove that line. If you don't think that's the correct way to solve it, feel free to close the PR.

Comment thread .gitignore
@l0rinc l0rinc closed this Aug 19, 2024
@l0rinc l0rinc deleted the l0rinc/gitignore branch August 19, 2024 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants