pgsql: Fix whitespace issues found by git diff --check, add gitattribut
Fix whitespace issues found by git diff --check, add gitattributes
Set per file type attributes in .gitattributes to fine-tune whitespace
checks. With the associated cleanups, the tree is now clean for git
Branch
------
master
Details
-------
http://git.postgresql.org/pg/commitdiff/001e114b8d59f4eaf2a314a2bc5e57078afdf82f
Modified Files
--------------
.gitattributes | 34 +++++++++
configure.in | 2 +-
contrib/hstore/hstore--1.1--1.2.sql | 4 +-
contrib/hstore/sql/hstore.sql | 1 -
contrib/intarray/bench/bench.pl | 2 +-
contrib/pgbench/pgbench.c | 18 +++--
contrib/pgcrypto/expected/pgp-encrypt.out | 36 +++++-----
contrib/pgcrypto/sql/pgp-encrypt.sql | 36 +++++-----
doc/src/sgml/event-trigger.sgml | 4 +-
doc/src/sgml/func.sgml | 2 +-
doc/src/sgml/pgbench.sgml | 2 +-
doc/src/sgml/ref/select.sgml | 2 +-
doc/src/sgml/sources.sgml | 2 +-
doc/src/sgml/syntax.sgml | 2 +-
src/backend/catalog/aclchk.c | 2 +-
src/backend/catalog/objectaddress.c | 4 +-
src/backend/commands/tablecmds.c | 18 ++---
src/backend/nodes/makefuncs.c | 1 -
src/backend/optimizer/plan/createplan.c | 2 +-
src/backend/parser/gram.y | 46 ++++++-------
src/backend/postmaster/bgworker.c | 2 +-
src/backend/storage/ipc/dsm.c | 2 +-
src/backend/utils/adt/json.c | 72 ++++++++++----------
src/backend/utils/cache/relcache.c | 2 +-
src/backend/utils/error/elog.c | 16 ++---
src/backend/utils/misc/guc.c | 2 +-
src/backend/utils/misc/postgresql.conf.sample | 4 +-
src/bin/pg_dump/pg_dump.c | 10 +--
src/bin/psql/command.c | 21 +++---
src/bin/psql/describe.c | 6 +-
src/bin/psql/tab-complete.c | 2 +-
src/include/nodes/execnodes.h | 4 +-
src/include/nodes/parsenodes.h | 2 +-
src/interfaces/ecpg/README.dynSQL | 8 +--
src/interfaces/ecpg/preproc/check_rules.pl | 1 -
src/interfaces/ecpg/preproc/parse.pl | 6 +-
src/interfaces/ecpg/preproc/pgc.l | 18 ++---
src/interfaces/ecpg/test/Makefile | 2 +-
.../ecpg/test/expected/preproc-autoprep.c | 4 +-
src/interfaces/ecpg/test/expected/preproc-type.c | 2 +-
src/interfaces/ecpg/test/expected/sql-fetch.c | 4 +-
src/interfaces/ecpg/test/expected/sql-insupd.c | 2 +-
src/interfaces/ecpg/test/expected/sql-parser.c | 4 +-
src/interfaces/ecpg/test/expected/sql-quote.c | 2 +-
src/interfaces/ecpg/test/preproc/autoprep.pgc | 4 +-
src/interfaces/ecpg/test/preproc/type.pgc | 2 +-
src/interfaces/ecpg/test/sql/dyntest.pgc | 4 +-
src/interfaces/ecpg/test/sql/fetch.pgc | 4 +-
src/interfaces/ecpg/test/sql/insupd.pgc | 2 +-
src/interfaces/ecpg/test/sql/parser.pgc | 8 +--
src/interfaces/ecpg/test/sql/quote.pgc | 2 +-
src/pl/plperl/expected/plperl_array.out | 8 +--
src/pl/plperl/sql/plperl_array.sql | 8 +--
src/pl/plpgsql/src/pl_exec.c | 14 ++--
src/pl/plpgsql/src/pl_gram.y | 2 +-
src/pl/tcl/expected/pltcl_setup.out | 10 +--
src/pl/tcl/modules/pltcl_listmod.in | 4 +-
src/pl/tcl/modules/pltcl_loadmod.in | 4 +-
src/pl/tcl/sql/pltcl_setup.sql | 10 +--
src/test/regress/expected/alter_generic.out | 2 +-
src/test/regress/expected/json.out | 18 ++---
src/test/regress/expected/json_1.out | 18 ++---
src/test/regress/expected/plpgsql.out | 4 +-
src/test/regress/expected/select_views.out | 2 +-
src/test/regress/expected/select_views_1.out | 2 +-
src/test/regress/expected/uuid.out | 4 +-
src/test/regress/sql/alter_generic.sql | 2 +-
src/test/regress/sql/json.sql | 18 ++---
src/test/regress/sql/plpgsql.sql | 5 +-
src/test/regress/sql/select_views.sql | 2 +-
src/test/regress/sql/uuid.sql | 4 +-
src/timezone/tznames/Australia.txt | 1 -
src/timezone/tznames/Default | 1 -
src/timezone/tznames/Etc.txt | 1 -
src/tools/RELEASE_CHANGES | 6 +-
src/tools/copyright.pl | 1 -
src/tools/msvc/pgflex.pl | 1 -
src/tools/pgindent/pgindent.man | 1 -
78 files changed, 306 insertions(+), 291 deletions(-)
--
Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers
Peter Eisentraut <peter_e@gmx.net> writes:
Fix whitespace issues found by git diff --check, add gitattributes
Set per file type attributes in .gitattributes to fine-tune whitespace
checks. With the associated cleanups, the tree is now clean for git
Hmm, I thought the .gitattributes file would prevent this:
$ git diff --staged --check
src/test/regress/expected/join.out:3110: trailing whitespace.
+ q1 | q2 | f1 | ff
Is there something I have to do to configure git to honor the file?
(In case it matters, this is git 1.7.1, which is what Red Hat is
shipping these days in RHEL6.)
regards, tom lane
--
Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers
On 11/11/13, 10:26 AM, Tom Lane wrote:
Peter Eisentraut <peter_e@gmx.net> writes:
Fix whitespace issues found by git diff --check, add gitattributes
Set per file type attributes in .gitattributes to fine-tune whitespace
checks. With the associated cleanups, the tree is now clean for gitHmm, I thought the .gitattributes file would prevent this:
$ git diff --staged --check
src/test/regress/expected/join.out:3110: trailing whitespace.
+ q1 | q2 | f1 | ffIs there something I have to do to configure git to honor the file?
(In case it matters, this is git 1.7.1, which is what Red Hat is
shipping these days in RHEL6.)
Older versions of git (before 1.8.2) do not support the "**" syntax used
here:
**/expected/*.out -whitespace
If we're slightly daring, we could change this to just
*.out -whitespace
and analogously for the other entries, but I haven't fully analyzed that.
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
On 11/11/2013 02:17 PM, Peter Eisentraut wrote:
On 11/11/13, 10:26 AM, Tom Lane wrote:
Peter Eisentraut <peter_e@gmx.net> writes:
Fix whitespace issues found by git diff --check, add gitattributes
Set per file type attributes in .gitattributes to fine-tune whitespace
checks. With the associated cleanups, the tree is now clean for gitHmm, I thought the .gitattributes file would prevent this:
$ git diff --staged --check
src/test/regress/expected/join.out:3110: trailing whitespace.
+ q1 | q2 | f1 | ffIs there something I have to do to configure git to honor the file?
(In case it matters, this is git 1.7.1, which is what Red Hat is
shipping these days in RHEL6.)Older versions of git (before 1.8.2) do not support the "**" syntax used
here:**/expected/*.out -whitespace
If we're slightly daring, we could change this to just
*.out -whitespace
and analogously for the other entries, but I haven't fully analyzed that.
Can we please agree on a minimum version of git and just support its
features? Relying on versions close to the bleeding edge affects a lot
of people - specifically it potentially affects every buildfarm member
as well as every developer.
cheers
andrew
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
On Mon, 2013-11-11 at 14:38 -0500, Andrew Dunstan wrote:
Can we please agree on a minimum version of git and just support its
features? Relying on versions close to the bleeding
We're not relying on it. With an older version, you just can't take
advantage of the newer features, so everything stays the same for you.
That said, I have fixed this particular issue.
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
Peter Eisentraut <peter_e@gmx.net> writes:
That said, I have fixed this particular issue.
Thanks --- I'd just as soon not have to deal with a private installation
of git.
regards, tom lane
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers