=== Applying patches on top of PostgreSQL commit ID 843e50208a31b9e17e9ab530c93a158425cfb8ba === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Oct 11 02:20:19 UTC 2025 On branch cf/5524 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-add-function-argument-name-to-substr.patch === Applying: add function argument name to substr. === using 'git am' to apply patch ./v6-0002-add-function-argument-name-to-function-substring.patch === Applying: add function argument name to function substring error: sha1 information is lacking or useless (src/include/catalog/pg_proc.dat). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 add function argument name to function substring When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v6-0002-add-function-argument-name-to-function-substring.patch === can't find file to patch at input line 45 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 8f36831bed5e6182f4034fa4ae4bd16fe5272460 Mon Sep 17 00:00:00 2001 |From: jian he |Date: Mon, 21 Jul 2025 14:20:34 +0800 |Subject: [PATCH v6 2/2] add function argument name to function substring | |HEAD |\df substr | List of functions | Schema | Name | Result data type | Argument data types | Type |------------+-----------+------------------+-------------------------+------ | pg_catalog | substring | bit | bit, integer | func | pg_catalog | substring | bit | bit, integer, integer | func | pg_catalog | substring | bytea | bytea, integer | func | pg_catalog | substring | bytea | bytea, integer, integer | func | pg_catalog | substring | text | text, integer | func | pg_catalog | substring | text | text, integer, integer | func | pg_catalog | substring | text | text, text | func | pg_catalog | substring | text | text, text, text | func | |with patch |\df substring | Schema | Name | Result data type | Argument data types | Type |------------+-----------+------------------+--------------------------------------------------+------ | pg_catalog | substring | bit | bits bit, start integer, count integer | func | pg_catalog | substring | bytea | bytes bytea, start integer | func | pg_catalog | substring | bytea | bytes bytea, start integer, count integer | func | pg_catalog | substring | bit | string bit, start integer | func | pg_catalog | substring | text | string text, pattern text | func | pg_catalog | substring | text | string text, pattern text, escape_character text | func | pg_catalog | substring | text | string text, start integer | func | pg_catalog | substring | text | string text, start integer, count integer | func |(8 rows) | |discussion: https://postgr.es/m/CACJufxHTBkymh06D4mGKNe1YfRNFN+gFBybmygWk=PtMqu00LQ@mail.gmail.com |--- | doc/src/sgml/func.sgml | 110 +++++++++++++++++++++-- | src/backend/catalog/system_functions.sql | 2 +- | src/include/catalog/pg_proc.dat | 8 ++ | 3 files changed, 113 insertions(+), 7 deletions(-) | |diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml |index f5a0e0954a1..a26dbf6fe0a 100644 |--- a/doc/src/sgml/func.sgml |+++ b/doc/src/sgml/func.sgml -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored patching file src/backend/catalog/system_functions.sql patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 3748 (offset 12 lines). Hunk #2 succeeded at 4170 (offset 12 lines). Hunk #3 succeeded at 4200 (offset 12 lines). Hunk #4 succeeded at 6306 (offset 20 lines). Hunk #5 succeeded at 6510 (offset 20 lines). Unstaged changes after reset: M src/backend/catalog/system_functions.sql M src/include/catalog/pg_proc.dat === using 'git apply' to apply patch ./v6-0002-add-function-argument-name-to-function-substring.patch === error: doc/src/sgml/func.sgml: does not exist in index Applied patch to 'src/backend/catalog/system_functions.sql' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application...