pgindent-exclude-fix.patch
text/x-patch
Filename: pgindent-exclude-fix.patch
Type: text/x-patch
Part: 0
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: unified
| File | + | − |
|---|---|---|
| src/tools/pgindent/pgindent | 7 | 2 |
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 5eff1f8032..1f95a1a34e 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -63,6 +63,10 @@ $code_base ||= '.' unless @ARGV;
$excludes ||= "$code_base/src/tools/pgindent/exclude_file_patterns"
if $code_base && -f "$code_base/src/tools/pgindent/exclude_file_patterns";
+# also look under the current directory for the exclude patterns file
+$excludes ||= "src/tools/pgindent/exclude_file_patterns"
+ if -f "src/tools/pgindent/exclude_file_patterns";
+
# The typedef list that's mechanically extracted by the buildfarm may omit
# some names we want to treat like typedefs, e.g. "bool" (which is a macro
# according to <stdbool.h>), and may include some names we don't want
@@ -421,8 +425,6 @@ File::Find::find(
},
$code_base) if $code_base;
-process_exclude();
-
$filtered_typedefs_fh = load_typedefs();
check_indent();
@@ -430,6 +432,9 @@ check_indent();
# any non-option arguments are files to be processed
push(@files, @ARGV);
+# the exclude list applies to command line arguments as well as found files
+process_exclude();
+
foreach my $source_filename (@files)
{
# ignore anything that's not a .c or .h file