diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2026-01-12 11:50:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-12 03:50:57 +0000 |
| commit | 7a6e8d4430764d34b189a038ae41c7c31297cc20 (patch) | |
| tree | 6a271b8b279d46a365d9e3245d05e07da831be61 /scripts | |
| parent | e790c87cd8bfd9198e8f2bb72f25d00038178beb (diff) | |
docs: misc (#37281)
Close #37289
Close #37348
Co-authored-by: Marc Jakobi <marc@jakobi.dev>
Co-authored-by: Anton Kesy <anton@kesy.de>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/collect_typos.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/collect_typos.lua b/scripts/collect_typos.lua index a4db3c2376..e85fdc9c89 100755 --- a/scripts/collect_typos.lua +++ b/scripts/collect_typos.lua @@ -111,7 +111,9 @@ local function main() { 'gh', 'pr', 'diff', tostring(pr_number), '--patch' }, 'Failed to get patch of PR ' .. pr_number ) - if run({ 'git', 'apply', '--index', '-' }, patch_file) then + -- Using --3way allows skipping changes already included in a previous commit. + -- If there are conflicts, it will fail and need manual conflict resolution. + if run({ 'git', 'apply', '--index', '--3way', '-' }, patch_file) then table.insert(close_pr_lines, ('Close #%d'):format(pr_number)) for author in patch_file:gmatch('\nFrom: (.- <.->)\n') do local co_author_line = ('Co-authored-by: %s'):format(mime_decode(author)) |