1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Swap .gitignore and .p4ignore.

Git version 2.32 added the backwards-incompatible "feature" that
.gitignore files that are symbolic links are ignored. Since all our
.gitignore files are symbolic links to the .p4ignore file in the same
directory, for compatibility between the Perforce and Git mirrors of
the repository, this broke "git status" for us and all our users.

See https://github.com/git/git/blob/master/Documentation/RelNotes/2.32.0.txt

This change swaps the files so that .p4ignore is a symbolic link to
.gitignore in each case.
This commit is contained in:
Gareth Rees 2022-01-11 14:31:51 +00:00
parent f836f1ead8
commit 4251abf5c6
14 changed files with 140 additions and 140 deletions

View file

@ -1,32 +0,0 @@
# .p4ignore -- Perforce files to ignore from MPS Project
# $Id$
# Don't forget to consider files in more specific directories.
# Personal Perforce configurations
.p4config
# Mac OS X Finder turds
.DS_Store
# Patch results
*.orig
*.rej
# Autoconf and Automake output
Makefile
autom4te.cache
config.log
config.status
.deps
.dirstamp
bin
lib
# Misc
TAGS
*.dSYM
*.pyc
test/obj
test/test/log
test/test/obj
....gcda
....gcno
\#*#
*~
.#.*
core

1
mps/.p4ignore Symbolic link
View file

@ -0,0 +1 @@
.gitignore

View file

@ -1 +0,0 @@
.p4ignore

32
mps/.renamed-gitignore Normal file
View file

@ -0,0 +1,32 @@
# .p4ignore -- Perforce files to ignore from MPS Project
# $Id$
# Don't forget to consider files in more specific directories.
# Personal Perforce configurations
.p4config
# Mac OS X Finder turds
.DS_Store
# Patch results
*.orig
*.rej
# Autoconf and Automake output
Makefile
autom4te.cache
config.log
config.status
.deps
.dirstamp
bin
lib
# Misc
TAGS
*.dSYM
*.pyc
test/obj
test/test/log
test/test/obj
....gcda
....gcno
\#*#
*~
.#.*
core

View file

@ -1,63 +0,0 @@
# code/.p4ignore -- Perforce files to ignore list
# $Id$
# Make output
anangc
ananll
ananmv
fri3gc
fri3ll
fri6gc
fri6ll
lia6gc
lia6ll
lii3gc
lii6gc
lii6ll
w3i3mv
w3i6mv
xca6ll
xci3gc
xci3ll
xci6gc
xci6ll
# Visual Studio junk
Debug
Release
*.filters
*.user
*.suo
# Telemetry event logs
mpsio*.log
mpsio*.sql
mpsio*.txt
# Build products
*.o
*.obj
*.a
*.so
*.lib
*.exe
a.out
core
# Xcode junk
xc
mps.xcodeproj/xcuserdata
mps.xcodeproj/project.xcworkspace
tags
# Temporary files
0
1
2
3
4
5
6
7
8
9
# Mac OS X Finder turds
.DS_Store
# Emacs backups
*~
# GNU make dependencies
*/*/*.d

1
mps/code/.p4ignore Symbolic link
View file

@ -0,0 +1 @@
.gitignore

View file

@ -1 +0,0 @@
.p4ignore

View file

@ -0,0 +1,63 @@
# code/.p4ignore -- Perforce files to ignore list
# $Id$
# Make output
anangc
ananll
ananmv
fri3gc
fri3ll
fri6gc
fri6ll
lia6gc
lia6ll
lii3gc
lii6gc
lii6ll
w3i3mv
w3i6mv
xca6ll
xci3gc
xci3ll
xci6gc
xci6ll
# Visual Studio junk
Debug
Release
*.filters
*.user
*.suo
# Telemetry event logs
mpsio*.log
mpsio*.sql
mpsio*.txt
# Build products
*.o
*.obj
*.a
*.so
*.lib
*.exe
a.out
core
# Xcode junk
xc
mps.xcodeproj/xcuserdata
mps.xcodeproj/project.xcworkspace
tags
# Temporary files
0
1
2
3
4
5
6
7
8
9
# Mac OS X Finder turds
.DS_Store
# Emacs backups
*~
# GNU make dependencies
*/*/*.d

View file

@ -1,10 +0,0 @@
# code/w3mv/.p4ignore -- Perforce files to ignore from Visual Studio
# $Id$
# Subproject build results
*/Debug
*/Release
# Temporary user preferences
*.vcxproj.user
# Mystery rubbish
*.sdf
*.opensdf

1
mps/code/w3mv/.p4ignore Symbolic link
View file

@ -0,0 +1 @@
.gitignore

View file

@ -1 +0,0 @@
.p4ignore

View file

@ -0,0 +1,10 @@
# code/w3mv/.p4ignore -- Perforce files to ignore from Visual Studio
# $Id$
# Subproject build results
*/Debug
*/Release
# Temporary user preferences
*.vcxproj.user
# Mystery rubbish
*.sdf
*.opensdf

View file

@ -1,12 +0,0 @@
Makefile
scheme
scheme.dSYM
scheme-advanced
scheme-advanced.dSYM
scheme-boehm
scheme-boehm.dSYM
scheme-malloc
scheme-malloc.dSYM
a.out
*.o
core

View file

@ -0,0 +1 @@
.gitignore

View file

@ -1 +0,0 @@
.p4ignore

View file

@ -0,0 +1,12 @@
Makefile
scheme
scheme.dSYM
scheme-advanced
scheme-advanced.dSYM
scheme-boehm
scheme-boehm.dSYM
scheme-malloc
scheme-malloc.dSYM
a.out
*.o
core

View file

@ -1,8 +0,0 @@
doctrees
converted
epub
html
mmref
source/design/*.rst
source/design/*.svg
tool

1
mps/manual/.p4ignore Symbolic link
View file

@ -0,0 +1 @@
.gitignore

View file

@ -1 +0,0 @@
.p4ignore

View file

@ -0,0 +1,8 @@
doctrees
converted
epub
html
mmref
source/design/*.rst
source/design/*.svg
tool

View file

@ -1,7 +0,0 @@
# The files in this directory are generated by the "mps" extension to Sphinx,
# except the index and the "old designs" index.
*.png
*.rst
*.svg
!index.rst
!old.rst

View file

@ -0,0 +1 @@
.gitignore

View file

@ -1 +0,0 @@
.p4ignore

View file

@ -0,0 +1,7 @@
# The files in this directory are generated by the "mps" extension to Sphinx,
# except the index and the "old designs" index.
*.png
*.rst
*.svg
!index.rst
!old.rst

View file

@ -1 +0,0 @@
.test

1
mps/tool/.p4ignore Symbolic link
View file

@ -0,0 +1 @@
.gitignore

View file

@ -1 +0,0 @@
.p4ignore

View file

@ -0,0 +1 @@
.test