Good day pga-hackers,
while playing around with the source and Git I found out that building
an executable on my Raspberry Pi creates a file called "pgAdmin4" in the
runtime folder. The .gitignore file in the same folder only mentions a
"pgadmin4" file without a capital "a" in its name.
As I'm new to this project it could well be that this was changed in one
of the last commits of which I have no knowledge. Because it's just a
small change to fix this potentially new and probably unwanted error I
attached the fix to this mail. I also put all lines in the .gitignores
in alphabetical order to make them easier to read and to prevent
duplicate lines.
No matter if only the real fix is going to get accepted or the
reordering too: did I submit the .diff (patch) correctly? I'm new to Git
via the command line as you already know. Please tell me, if I made any
mistakes.
Greetings from Germany,
Jonas Thelemann
diff --git a/.gitignore b/.gitignore
index e1fdf53..0ae8098 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,35 @@
+*.autosave
*.db
-*.pyc
-*.pyo
-*.o
-*.psp
*.diff
+*.o
*.patch
-*.autosave
-_build
-build-*
+*.psp
+*.pyc
+*.pyo
+*.swo
+*.swp
.DS_Store
.idea
+/dist
+/mac-build
+/pip-build
+/src-build
+/win-build
+_build
+build-*
+pgadmin4.log
+pkg/win32/installer.iss
runtime/.qmake.cache
+runtime/.qmake.stash
runtime/Makefile
+runtime/Makefile.Debug
+runtime/Makefile.Release
runtime/moc_BrowserWindow.cpp
runtime/moc_Server.cpp
runtime/pgAdmin4.app/
runtime/pgAdmin4.pro.user*
+runtime/pgAdmin4_resource.rc
+runtime/release/
runtime/ui_BrowserWindow.h
-runtime/.qmake.stash
web/config_local.py
web/regression/test_config.json
-pgadmin4.log
-*.swp
-*.swo
-/mac-build
-/src-build
-/pip-build
-/win-build
-/dist
-pkg/win32/installer.iss
-runtime/Makefile.Debug
-runtime/Makefile.Release
-runtime/release/
-runtime/pgAdmin4_resource.rc
diff --git a/pkg/mac/.gitignore b/pkg/mac/.gitignore
index 5656003..a9aa86f 100644
--- a/pkg/mac/.gitignore
+++ b/pkg/mac/.gitignore
@@ -1,4 +1,4 @@
# Global excludes across all subdirectories
+codesign.conf
debug.pgadmin.Info.plist
pgadmin.Info.plist
-codesign.conf
diff --git a/runtime/.gitignore b/runtime/.gitignore
index a130a9a..8075ebd 100644
--- a/runtime/.gitignore
+++ b/runtime/.gitignore
@@ -1,13 +1,14 @@
.qmake.cache
+.qmake.stash
Makefile
moc_BrowserWindow.cpp
+moc_ConfigWindow.cpp
moc_Server.cpp
+moc_TabWindow.cpp
+moc_WebViewWindow.cpp
+pgAdmin4
pgAdmin4.app/
pgAdmin4.pro.user*
+qrc_pgAdmin4.cpp
ui_BrowserWindow.h
-.qmake.stash
-moc_ConfigWindow.cpp
-moc_TabWindow.cpp
-moc_WebViewWindow.cpp
-qrc_pgadmin4.cpp
ui_ConfigWindow.h
diff --git a/web/regression/.gitignore b/web/regression/.gitignore
index 570f022..0581810 100644
--- a/web/regression/.gitignore
+++ b/web/regression/.gitignore
@@ -1,4 +1,4 @@
parent_id.pkl
regression.log
-test_config.json
test_advanced_config.json
+test_config.json
--
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers
