Skip to content

Commit

Permalink
gitignore: Sort for readability
Browse files Browse the repository at this point in the history
find . -name .gitignore -print0 | xargs -i -0 sort -o '{}' '{}'
  • Loading branch information
jay committed Aug 18, 2015
1 parent 5a13639 commit 9518139
Show file tree
Hide file tree
Showing 23 changed files with 80 additions and 80 deletions.
58 changes: 29 additions & 29 deletions .gitignore
@@ -1,51 +1,51 @@
.deps
.libs
*.lib
*.pdb
*.asc
*.dll
*.exe
*.exp
*.la
*.lib
*.lo
*.o
*.obj
*.asc
*.pdb
*~
.*.swp
.cproject
.deps
.dirstamp
.libs
.project
.settings
/build/
/builds/
CHANGES.dist
Debug
Release
*.exp
INSTALL
Makefile
Makefile.in
Release
TAGS
aclocal.m4
aclocal.m4.bak
autom4te.cache
compile
config.cache
config.guess
config.log
config.status
config.sub
configure
depcomp
libtool
ltmain.sh
compile
curl-config
libcurl.pc
missing
curl-*.tar.gz
curl-*.tar.bz2
curl-*.tar.gz
curl-*.tar.lzma
curl-*.zip
INSTALL
curl-config
depcomp
install-sh
*.o
*.lo
*.la
libcurl.pc
libtool
ltmain.sh
missing
mkinstalldirs
tags
TAGS
*~
aclocal.m4.bak
CHANGES.dist
.project
.cproject
.settings
.dirstamp
test-driver
/build/
/builds/
2 changes: 1 addition & 1 deletion include/curl/.gitignore
@@ -1,4 +1,4 @@
curlbuild.h
curlver.h.dist
stamp-h2
stamp-h3
curlver.h.dist
18 changes: 9 additions & 9 deletions lib/.gitignore
@@ -1,15 +1,15 @@
curl_config.h
curl_config.h.in
stamp-h1
*.a
*.imp
*.nlm
*.orig
*.rej
TAGS
*.res
Makefile.vc10.dist
Makefile.vc8.dist
Makefile.vc9.dist
TAGS
curl_config.h
curl_config.h.in
libcurl.plist.dist
Makefile.vc10.dist
libcurl.vers
*.a
*.res
*.imp
*.nlm
stamp-h1
4 changes: 2 additions & 2 deletions projects/Windows/VC10/lib/.gitignore
@@ -1,7 +1,7 @@
/*.vcxproj
/*.filters
/*.user
/*.ncb
/*.opensdf
/*.sdf
/*.suo
/*.user
/*.vcxproj
4 changes: 2 additions & 2 deletions projects/Windows/VC10/src/.gitignore
@@ -1,7 +1,7 @@
/*.vcxproj
/*.filters
/*.user
/*.ncb
/*.opensdf
/*.sdf
/*.suo
/*.user
/*.vcxproj
4 changes: 2 additions & 2 deletions projects/Windows/VC11/lib/.gitignore
@@ -1,7 +1,7 @@
/*.vcxproj
/*.filters
/*.user
/*.ncb
/*.opensdf
/*.sdf
/*.suo
/*.user
/*.vcxproj
4 changes: 2 additions & 2 deletions projects/Windows/VC11/src/.gitignore
@@ -1,7 +1,7 @@
/*.vcxproj
/*.filters
/*.user
/*.ncb
/*.opensdf
/*.sdf
/*.suo
/*.user
/*.vcxproj
4 changes: 2 additions & 2 deletions projects/Windows/VC12/lib/.gitignore
@@ -1,7 +1,7 @@
/*.vcxproj
/*.filters
/*.user
/*.ncb
/*.opensdf
/*.sdf
/*.suo
/*.user
/*.vcxproj
4 changes: 2 additions & 2 deletions projects/Windows/VC12/src/.gitignore
@@ -1,7 +1,7 @@
/*.vcxproj
/*.filters
/*.user
/*.ncb
/*.opensdf
/*.sdf
/*.suo
/*.user
/*.vcxproj
2 changes: 1 addition & 1 deletion projects/Windows/VC14/lib/.gitignore
@@ -1,5 +1,5 @@
/*.vcxproj
/*.filters
/*.opensdf
/*.sdf
/*.vcxproj
/.vs
4 changes: 2 additions & 2 deletions projects/Windows/VC14/src/.gitignore
@@ -1,5 +1,5 @@
/*.vcxproj
/*.filters
/*.opensdf
/*.sdf
/.vs
/*.vcxproj
/.vs
2 changes: 1 addition & 1 deletion projects/Windows/VC7.1/lib/.gitignore
@@ -1,3 +1,3 @@
/*.vcproj
/*.ncb
/*.suo
/*.vcproj
2 changes: 1 addition & 1 deletion projects/Windows/VC7.1/src/.gitignore
@@ -1,3 +1,3 @@
/*.vcproj
/*.ncb
/*.suo
/*.vcproj
2 changes: 1 addition & 1 deletion projects/Windows/VC7/lib/.gitignore
@@ -1,2 +1,2 @@
/*.vcproj
/*.ncb
/*.vcproj
2 changes: 1 addition & 1 deletion projects/Windows/VC7/src/.gitignore
@@ -1,2 +1,2 @@
/*.vcproj
/*.ncb
/*.vcproj
4 changes: 2 additions & 2 deletions projects/Windows/VC8/lib/.gitignore
@@ -1,4 +1,4 @@
/*.vcproj
/*.user
/*.ncb
/*.suo
/*.user
/*.vcproj
4 changes: 2 additions & 2 deletions projects/Windows/VC8/src/.gitignore
@@ -1,4 +1,4 @@
/*.vcproj
/*.user
/*.ncb
/*.suo
/*.user
/*.vcproj
4 changes: 2 additions & 2 deletions projects/Windows/VC9/lib/.gitignore
@@ -1,4 +1,4 @@
/*.vcproj
/*.user
/*.ncb
/*.suo
/*.user
/*.vcproj
4 changes: 2 additions & 2 deletions projects/Windows/VC9/src/.gitignore
@@ -1,4 +1,4 @@
/*.vcproj
/*.user
/*.ncb
/*.suo
/*.user
/*.vcproj
16 changes: 8 additions & 8 deletions src/.gitignore
@@ -1,13 +1,13 @@
*.a
*.nlm
*.res
Makefile.vc10.dist
Makefile.vc8.dist
Makefile.vc9.dist
config-win32.h
curl
curl_config.h
curl_config.h.in
tool_hugehelp.c
stamp-h2
Makefile.vc8.dist
Makefile.vc9.dist
tool_hugehelp.c
tool_version.h.dist
Makefile.vc10.dist
config-win32.h
*.a
*.res
*.nlm
8 changes: 4 additions & 4 deletions tests/.gitignore
@@ -1,4 +1,5 @@
log
*pid
configurehelp.pm
curl_client_key
curl_client_key.pub
curl_client_knownhosts
Expand All @@ -8,10 +9,9 @@ curl_sftp_cmds
curl_sftp_config
curl_ssh_config
curl_sshd_config
*pid
stunnel.conf
log
runtests.html
runtests.pdf
stunnel.conf
testcurl.html
testcurl.pdf
configurehelp.pm
2 changes: 1 addition & 1 deletion tests/libtest/.gitignore
@@ -1,7 +1,7 @@
chkhostname
lib5[0-9][0-9]
lib15[0-9][0-9]
lib19[0-9][0-9]
lib2033
lib5[0-9][0-9]
libauthretry
libntlmconnect
2 changes: 1 addition & 1 deletion tests/server/.gitignore
@@ -1,7 +1,7 @@
fake_ntlm
getpart
resolve
rtspd
sockfilt
sws
tftpd
fake_ntlm

3 comments on commit 9518139

@jay
Copy link
Member Author

@jay jay commented on 9518139 Aug 18, 2015

Choose a reason for hiding this comment

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

@captain-caveman2k The Visual Studio gitignores are hard to manage since there are 3 for each version. I think it would be better if we consolidated. Let me know what you think of doing something like jay@761d188

@captain-caveman2k
Copy link
Contributor

Choose a reason for hiding this comment

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

Hiya Jay,

I'm not sure why you think they are "hard to manage" as "typically" these .gitignore files do not change - they don't really get added to after the project files have been set up. Bare your sort check in this week they haven't changed since I added them in April 2014.

Not only that but personally I'm not a fan of top level .gitignore files - I like to see exactly what files are being hidden in what folder/directory. I appreciate there is some duplication by doing it this way but one can also argue what is the point in "trying" to hide a .dsp file in the VC7 folder for example or vcproj files in VC10. In that respect it's 6 of one and half a dozen of the other in my opinion.

If there are common files then we might want to consider moving those up the directory hierarchy to reduce this duplication...

For example:

*.ncb in VC7.gitignore

Rather than:

/*.ncb in VC7.gitignore, VC7\src.gitignore and VC7\lib.gitignore

However, I wouldn't add it to projects\Windows.gitignore as they are not applicable to VC14 for example.

As such I wouldn't like to see one .gitignore in projects\Windows - if we are going to go down that route we may as well add them to curl.gitignore ;-)

@jay
Copy link
Member Author

@jay jay commented on 9518139 Aug 23, 2015

Choose a reason for hiding this comment

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

I hear you. Basically I want to get in and out in the least amount of time. If I'm adding an extension to ignore it's usually for multiple versions, so that's why I think it would be easier to have a single one that we know has all the visual studio stuff. I'm interpreting your answer that if I combine VCn/lib/.gitignore and VCn/src/.gitignore into VCn/.gitignore you'd be OK with that? Then I'd do that and put ipch/ in VC{10,11,12,14}/.gitignore. Concerning enc_temp_folder/ which is for Visual Studio auto-recovery (eg a crash), I'm not entirely sure which versions use it though it looks like VS2008+ so I would put it in those.

Please sign in to comment.