From 839ce9c6d355205d47902e8b4f419820839437f6 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Tue, 11 Jan 2022 14:31:51 +0000 Subject: [PATCH] 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. --- mps/.p4ignore | 33 +---------- mps/.renamed-gitignore | 33 ++++++++++- mps/code/.p4ignore | 64 +-------------------- mps/code/.renamed-gitignore | 64 ++++++++++++++++++++- mps/code/w3mv/.p4ignore | 11 +--- mps/code/w3mv/.renamed-gitignore | 11 +++- mps/example/scheme/.p4ignore | 13 +---- mps/example/scheme/.renamed-gitignore | 13 ++++- mps/manual/.p4ignore | 9 +-- mps/manual/.renamed-gitignore | 9 ++- mps/manual/source/design/.p4ignore | 8 +-- mps/manual/source/design/.renamed-gitignore | 8 ++- mps/tool/.p4ignore | 2 +- mps/tool/.renamed-gitignore | 2 +- 14 files changed, 140 insertions(+), 140 deletions(-) mode change 100644 => 120000 mps/.p4ignore mode change 120000 => 100644 mps/.renamed-gitignore mode change 100644 => 120000 mps/code/.p4ignore mode change 120000 => 100644 mps/code/.renamed-gitignore mode change 100755 => 120000 mps/code/w3mv/.p4ignore mode change 120000 => 100755 mps/code/w3mv/.renamed-gitignore mode change 100644 => 120000 mps/example/scheme/.p4ignore mode change 120000 => 100644 mps/example/scheme/.renamed-gitignore mode change 100644 => 120000 mps/manual/.p4ignore mode change 120000 => 100644 mps/manual/.renamed-gitignore mode change 100644 => 120000 mps/manual/source/design/.p4ignore mode change 120000 => 100644 mps/manual/source/design/.renamed-gitignore mode change 100644 => 120000 mps/tool/.p4ignore mode change 120000 => 100644 mps/tool/.renamed-gitignore diff --git a/mps/.p4ignore b/mps/.p4ignore deleted file mode 100644 index 89c70e46dc5..00000000000 --- a/mps/.p4ignore +++ /dev/null @@ -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 diff --git a/mps/.p4ignore b/mps/.p4ignore new file mode 120000 index 00000000000..3e4e48b0b5f --- /dev/null +++ b/mps/.p4ignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/mps/.renamed-gitignore b/mps/.renamed-gitignore deleted file mode 120000 index c5c99a6a89c..00000000000 --- a/mps/.renamed-gitignore +++ /dev/null @@ -1 +0,0 @@ -.p4ignore \ No newline at end of file diff --git a/mps/.renamed-gitignore b/mps/.renamed-gitignore new file mode 100644 index 00000000000..89c70e46dc5 --- /dev/null +++ b/mps/.renamed-gitignore @@ -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 diff --git a/mps/code/.p4ignore b/mps/code/.p4ignore deleted file mode 100644 index ff483930b8a..00000000000 --- a/mps/code/.p4ignore +++ /dev/null @@ -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 diff --git a/mps/code/.p4ignore b/mps/code/.p4ignore new file mode 120000 index 00000000000..3e4e48b0b5f --- /dev/null +++ b/mps/code/.p4ignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/mps/code/.renamed-gitignore b/mps/code/.renamed-gitignore deleted file mode 120000 index c5c99a6a89c..00000000000 --- a/mps/code/.renamed-gitignore +++ /dev/null @@ -1 +0,0 @@ -.p4ignore \ No newline at end of file diff --git a/mps/code/.renamed-gitignore b/mps/code/.renamed-gitignore new file mode 100644 index 00000000000..ff483930b8a --- /dev/null +++ b/mps/code/.renamed-gitignore @@ -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 diff --git a/mps/code/w3mv/.p4ignore b/mps/code/w3mv/.p4ignore deleted file mode 100755 index 81b5d6c8620..00000000000 --- a/mps/code/w3mv/.p4ignore +++ /dev/null @@ -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 diff --git a/mps/code/w3mv/.p4ignore b/mps/code/w3mv/.p4ignore new file mode 120000 index 00000000000..3e4e48b0b5f --- /dev/null +++ b/mps/code/w3mv/.p4ignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/mps/code/w3mv/.renamed-gitignore b/mps/code/w3mv/.renamed-gitignore deleted file mode 120000 index c5c99a6a89c..00000000000 --- a/mps/code/w3mv/.renamed-gitignore +++ /dev/null @@ -1 +0,0 @@ -.p4ignore \ No newline at end of file diff --git a/mps/code/w3mv/.renamed-gitignore b/mps/code/w3mv/.renamed-gitignore new file mode 100755 index 00000000000..81b5d6c8620 --- /dev/null +++ b/mps/code/w3mv/.renamed-gitignore @@ -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 diff --git a/mps/example/scheme/.p4ignore b/mps/example/scheme/.p4ignore deleted file mode 100644 index e368d2c9887..00000000000 --- a/mps/example/scheme/.p4ignore +++ /dev/null @@ -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 diff --git a/mps/example/scheme/.p4ignore b/mps/example/scheme/.p4ignore new file mode 120000 index 00000000000..3e4e48b0b5f --- /dev/null +++ b/mps/example/scheme/.p4ignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/mps/example/scheme/.renamed-gitignore b/mps/example/scheme/.renamed-gitignore deleted file mode 120000 index c5c99a6a89c..00000000000 --- a/mps/example/scheme/.renamed-gitignore +++ /dev/null @@ -1 +0,0 @@ -.p4ignore \ No newline at end of file diff --git a/mps/example/scheme/.renamed-gitignore b/mps/example/scheme/.renamed-gitignore new file mode 100644 index 00000000000..e368d2c9887 --- /dev/null +++ b/mps/example/scheme/.renamed-gitignore @@ -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 diff --git a/mps/manual/.p4ignore b/mps/manual/.p4ignore deleted file mode 100644 index f2a531e43c7..00000000000 --- a/mps/manual/.p4ignore +++ /dev/null @@ -1,8 +0,0 @@ -doctrees -converted -epub -html -mmref -source/design/*.rst -source/design/*.svg -tool diff --git a/mps/manual/.p4ignore b/mps/manual/.p4ignore new file mode 120000 index 00000000000..3e4e48b0b5f --- /dev/null +++ b/mps/manual/.p4ignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/mps/manual/.renamed-gitignore b/mps/manual/.renamed-gitignore deleted file mode 120000 index c5c99a6a89c..00000000000 --- a/mps/manual/.renamed-gitignore +++ /dev/null @@ -1 +0,0 @@ -.p4ignore \ No newline at end of file diff --git a/mps/manual/.renamed-gitignore b/mps/manual/.renamed-gitignore new file mode 100644 index 00000000000..f2a531e43c7 --- /dev/null +++ b/mps/manual/.renamed-gitignore @@ -0,0 +1,8 @@ +doctrees +converted +epub +html +mmref +source/design/*.rst +source/design/*.svg +tool diff --git a/mps/manual/source/design/.p4ignore b/mps/manual/source/design/.p4ignore deleted file mode 100644 index b46be6a82ba..00000000000 --- a/mps/manual/source/design/.p4ignore +++ /dev/null @@ -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 diff --git a/mps/manual/source/design/.p4ignore b/mps/manual/source/design/.p4ignore new file mode 120000 index 00000000000..3e4e48b0b5f --- /dev/null +++ b/mps/manual/source/design/.p4ignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/mps/manual/source/design/.renamed-gitignore b/mps/manual/source/design/.renamed-gitignore deleted file mode 120000 index c5c99a6a89c..00000000000 --- a/mps/manual/source/design/.renamed-gitignore +++ /dev/null @@ -1 +0,0 @@ -.p4ignore \ No newline at end of file diff --git a/mps/manual/source/design/.renamed-gitignore b/mps/manual/source/design/.renamed-gitignore new file mode 100644 index 00000000000..b46be6a82ba --- /dev/null +++ b/mps/manual/source/design/.renamed-gitignore @@ -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 diff --git a/mps/tool/.p4ignore b/mps/tool/.p4ignore deleted file mode 100644 index 835fd9ec66f..00000000000 --- a/mps/tool/.p4ignore +++ /dev/null @@ -1 +0,0 @@ -.test \ No newline at end of file diff --git a/mps/tool/.p4ignore b/mps/tool/.p4ignore new file mode 120000 index 00000000000..3e4e48b0b5f --- /dev/null +++ b/mps/tool/.p4ignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/mps/tool/.renamed-gitignore b/mps/tool/.renamed-gitignore deleted file mode 120000 index c5c99a6a89c..00000000000 --- a/mps/tool/.renamed-gitignore +++ /dev/null @@ -1 +0,0 @@ -.p4ignore \ No newline at end of file diff --git a/mps/tool/.renamed-gitignore b/mps/tool/.renamed-gitignore new file mode 100644 index 00000000000..835fd9ec66f --- /dev/null +++ b/mps/tool/.renamed-gitignore @@ -0,0 +1 @@ +.test \ No newline at end of file