Skip to content

build: add configure~ to .gitignore #21911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 12, 2021
Merged

build: add configure~ to .gitignore #21911

merged 1 commit into from
May 12, 2021

Conversation

Sjors
Copy link
Member

@Sjors Sjors commented May 11, 2021

The file configure~ recently started appearing for me on macOS (11.3.1) whenever configure is (re)run.

@fanquake
Copy link
Member

You should add this to your local, global, .gitignore.

@Sjors
Copy link
Member Author

Sjors commented May 11, 2021

I can do that, but what makes it different from all the other artefacts?

@laanwj
Copy link
Member

laanwj commented May 11, 2021

I can do that, but what makes it different from all the other artefacts?

If it is produced by our build system it should go into .gitignore. If it is produced by your editor or IDE it should go into your local gitignore. See also #21894.

I don't think autotools generates a file like that, did you manually edit the configure output?

@laanwj
Copy link
Member

laanwj commented May 11, 2021

Curiously we have a line in .gitignore to ignore files with a ~ in them, however it doesn't trigger because configure doesn't have . too:

*.*~*

I suppose something is to be said for making that more general?

@Sjors
Copy link
Member Author

Sjors commented May 11, 2021 •
edited
Loading

It's not generated by my editor. It appears every time I run make (when it triggers a new configure, e.g. switching branches). But this only happens since recently, so there could be another problem.

E.g. it happens when I switch between master and bitcoin-core/gui#4 (which has trivial configure.ac change). It happens in either direction. But it does not happen when I git clean -dfx and run ./autogen and ./configure ... on either of these branches.

@hebasto
Copy link
Member

hebasto commented May 11, 2021

The file configure~ recently started appearing for me on macOS (11.3.1) whenever configure is (re)run.

This is due to the new 2.7.1 version of the autoconf Homebrew package.

@laanwj
Copy link
Member

laanwj commented May 12, 2021

OK well in that case I'm fine with adding this. Though extending the existing ~ rule to be more general might still make sense.

@hebasto
Copy link
Member

hebasto commented May 12, 2021

OK well in that case I'm fine with adding this. Though extending the existing ~ rule to be more general might still make sense.

I think the following patch should work for all cases:

--- a/.gitignore
+++ b/.gitignore
@@ -61,7 +61,7 @@ src/qt/bitcoin-qt.includes
 .dirstamp
 .libs
 .*.swp
-*.*~*
+*~
 *.bak
 *.rej
 *.orig

@Sjors @hebasto
build: add *~ to .gitignore
bc45388 
Homebrew autoconf version 2.7.1 introduces configure~ as a build artifact.

Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
@Sjors Sjors force-pushed the 2021/05/configure branch from 6f0614a to bc45388 Compare May 12, 2021 16:13
@Sjors
Copy link
Member Author

Sjors commented May 12, 2021

I switched to *~

@luke-jr
Copy link
Member

luke-jr commented May 12, 2021

Concept ACK to adding *~

If it is produced by our build system it should go into .gitignore. If it is produced by your editor or IDE it should go into your local gitignore.

Glancing at the current gitignore, we have many exceptions to this.

hebasto
hebasto approved these changes May 12, 2021
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK bc45388, tested on Linux Mint 20.1 with different build scenarios including cross-compiling for Windows and macOS.

@laanwj laanwj merged commit 79da18a into bitcoin:master May 12, 2021
@Sjors Sjors deleted the 2021/05/configure branch May 12, 2021 18:07
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 13, 2021
@laanwj
Merge bitcoin#21911: build: add configure~ to .gitignore
0136257 
bc45388 build: add *~ to .gitignore (Sjors Provoost)

Pull request description:

  The file `configure~` recently started appearing for me on macOS (11.3.1) whenever configure is (re)run.

ACKs for top commit:
  hebasto:
    ACK bc45388, tested on Linux Mint 20.1 with different build scenarios including cross-compiling for Windows and macOS.

Tree-SHA512: 830c7baf392ff6d66250a79c6ed0a98dac3daaace54a6d2e7940b9a72e3bac79ab44bbecd7642c931fde8a446654e2260d6afdecc679a1743fae6ec5eeda79f1
@klementtan klementtan mentioned this pull request Jun 14, 2021
Merged
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 27, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#21911: build: add configure~ to .gitignore
da18220 
bc45388 build: add *~ to .gitignore (Sjors Provoost)

Pull request description:

  The file `configure~` recently started appearing for me on macOS (11.3.1) whenever configure is (re)run.

ACKs for top commit:
  hebasto:
    ACK bc45388, tested on Linux Mint 20.1 with different build scenarios including cross-compiling for Windows and macOS.

Tree-SHA512: 830c7baf392ff6d66250a79c6ed0a98dac3daaace54a6d2e7940b9a72e3bac79ab44bbecd7642c931fde8a446654e2260d6afdecc679a1743fae6ec5eeda79f1
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 28, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#21911: build: add configure~ to .gitignore
d9229dd 
bc45388 build: add *~ to .gitignore (Sjors Provoost)

Pull request description:

  The file `configure~` recently started appearing for me on macOS (11.3.1) whenever configure is (re)run.

ACKs for top commit:
  hebasto:
    ACK bc45388, tested on Linux Mint 20.1 with different build scenarios including cross-compiling for Windows and macOS.

Tree-SHA512: 830c7baf392ff6d66250a79c6ed0a98dac3daaace54a6d2e7940b9a72e3bac79ab44bbecd7642c931fde8a446654e2260d6afdecc679a1743fae6ec5eeda79f1
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 29, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#21911: build: add configure~ to .gitignore
7b19ecf 
bc45388 build: add *~ to .gitignore (Sjors Provoost)

Pull request description:

  The file `configure~` recently started appearing for me on macOS (11.3.1) whenever configure is (re)run.

ACKs for top commit:
  hebasto:
    ACK bc45388, tested on Linux Mint 20.1 with different build scenarios including cross-compiling for Windows and macOS.

Tree-SHA512: 830c7baf392ff6d66250a79c6ed0a98dac3daaace54a6d2e7940b9a72e3bac79ab44bbecd7642c931fde8a446654e2260d6afdecc679a1743fae6ec5eeda79f1
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 1, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#21911: build: add configure~ to .gitignore
ffac9b7 
bc45388 build: add *~ to .gitignore (Sjors Provoost)

Pull request description:

  The file `configure~` recently started appearing for me on macOS (11.3.1) whenever configure is (re)run.

ACKs for top commit:
  hebasto:
    ACK bc45388, tested on Linux Mint 20.1 with different build scenarios including cross-compiling for Windows and macOS.

Tree-SHA512: 830c7baf392ff6d66250a79c6ed0a98dac3daaace54a6d2e7940b9a72e3bac79ab44bbecd7642c931fde8a446654e2260d6afdecc679a1743fae6ec5eeda79f1
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 1, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#21911: build: add configure~ to .gitignore
f847c29 
bc45388 build: add *~ to .gitignore (Sjors Provoost)

Pull request description:

  The file `configure~` recently started appearing for me on macOS (11.3.1) whenever configure is (re)run.

ACKs for top commit:
  hebasto:
    ACK bc45388, tested on Linux Mint 20.1 with different build scenarios including cross-compiling for Windows and macOS.

Tree-SHA512: 830c7baf392ff6d66250a79c6ed0a98dac3daaace54a6d2e7940b9a72e3bac79ab44bbecd7642c931fde8a446654e2260d6afdecc679a1743fae6ec5eeda79f1
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 15, 2021
@laanwj @PastaPastaPasta
Merge bitcoin#21911: build: add configure~ to .gitignore
aaf105c 
bc45388 build: add *~ to .gitignore (Sjors Provoost)

Pull request description:

  The file `configure~` recently started appearing for me on macOS (11.3.1) whenever configure is (re)run.

ACKs for top commit:
  hebasto:
    ACK bc45388, tested on Linux Mint 20.1 with different build scenarios including cross-compiling for Windows and macOS.

Tree-SHA512: 830c7baf392ff6d66250a79c6ed0a98dac3daaace54a6d2e7940b9a72e3bac79ab44bbecd7642c931fde8a446654e2260d6afdecc679a1743fae6ec5eeda79f1
gwillen pushed a commit to ElementsProject/elements that referenced this pull request Jun 1, 2022
@apoelstra
Merge 79da18a into merged_master (Bitcoin PR bitcoin/bitcoin#21911)
8a9235f
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hebasto hebasto hebasto approved these changes

Assignees
No one assigned
Labels
Scripts and tools
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Sjors @fanquake @laanwj @hebasto @luke-jr