These files were moved from src to src/config
Update .gitignore #4406
pull ghost wants to merge 1 commits into bitcoin:master from changing 1 files +3 −3-
ghost commented at 10:52 PM on June 24, 2014: none
-
ghost commented at 11:00 PM on June 24, 2014: none
I know, was being lazy and just using the web interface. Sorry, I'll do that next time.
-
theuni commented at 4:46 AM on June 25, 2014: member
@drak I don't mean to over-complicate a seemingly simple change, but there are some non-obvious implications here. bitcoin-config.h was moved to the config dir, but devs switching to/from older branches will likely still see it in the original location. By removing it from .gitignore, it will likely end up accidentally re-added to git at some point.
tl;dr Please leave the old entries there and just add the new ones. After that, ACK from me.
-
laanwj commented at 4:50 AM on June 25, 2014: member
On the other hand, removing it from .gitignore means that the duplicate bitcoin-config.h is now an extraneous file visible in 'get status'. I usually find that useful to know for keeping my tree clean.
-
laanwj commented at 4:56 AM on June 25, 2014: member
Well I don't really insist on one way or another, but I thought I'd mention that it's not clear-cut here. At some point the duplicate bitcoin-config.h even caused a build error, so anything that'd helped find the extraneous file would have been helpful :) But that bug has been fixed now. Personally I never blindly add files to git, so the scenario of accidentally adding it would be rarer for me. But other's milage may vary.
-
b79f59b995
Update .gitignore
Removing old file ignores so they show up in `git status`
-
theuni commented at 5:04 AM on June 25, 2014: member
The point of .gitignore is that they're generated files that should never be checked into source. These files have no impact if they exist from an old branch, other than the temptation to commit them. Leaving them in gitignore prevents that.
But it's a simple change not worthy of a debate, so, fine by me. Just prepare to see those files show up in git status for a while ;)
-
laanwj commented at 5:05 AM on June 25, 2014: member
Yep. And the way to remove them from git status is to remove them, not to commit them :P
ACK.
-
BitcoinPullTester commented at 5:07 AM on June 25, 2014: none
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4406_2dfe11b60066f9b0b79c0b3bf7c979fdd8d1c054/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
- laanwj merged this on Jun 25, 2014
- laanwj closed this on Jun 25, 2014
- laanwj referenced this in commit ea37a208de on Jun 25, 2014
- unknown deleted the branch on Jun 25, 2014
- MarcoFalke locked this on Sep 8, 2021