From: Taylor Blau Date: Fri, 23 May 2025 21:04:21 +0000 (-0400) Subject: Merge branch 'js/fix-open-exec-2.40.0' into js/fix-open-exec X-Git-Tag: v2.43.7~4^2~2^2~1 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d7bc50cece90c490b34a7137568d2c58db40807a;p=thirdparty%2Fgit.git 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 Signed-off-by: Taylor Blau --- d7bc50cece90c490b34a7137568d2c58db40807a