diff options
| author | Taylor Blau <me@ttaylorr.com> | 2025-05-23 17:04:21 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2025-05-23 17:04:21 -0400 |
| commit | d7bc50cece90c490b34a7137568d2c58db40807a (patch) | |
| tree | ee04874a8780ec9d4fd3fc29ee6a32a8e7632737 /git-gui/lib/commit.tcl | |
| parent | 8e3070aa5e331be45d4d03e3be41f84494fce129 (diff) | |
| parent | 026c397d911cde55924d7eb1311d0fd6e2e105d5 (diff) | |
Merge branch 'js/fix-open-exec-2.40.0' into js/fix-open-exec
Branch js/fix-open-exec-2.40.0 converts `open` and `exec` calls to call
wrappers that sanitze the command arguments. This side branch updates
three `open` calls that are in conflict with the fix in the preceding
commit. To keep the intended operation of the 'open' calls, this merge
does not try to merge and resolve the conflicts, but ignores the
conversions that are brought in by the side branch, taking "ours" side
of the code in these three cases.
New fixes are the topic of the next commit.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions