dotfiles
bugabingas dorkfiles
owned by bugabinga
fix(crypto): preserve merge driver quotes on Windows
5cb57f4d55138fb2e3aaedd4266c14aec0b77017
Oliver Krylow <o.krylow@isp-insoft.de> ·
unsigned
Browse filesCompare with HEAD
Changed files (1)
bootstripper.java
Modified173 173 run(root,
List.of(
"git",
"config",
"--local",
"filter." + filter_name
+ ".smudge",
174 174 "java " + aes
+ " decrypt --key-file " + key),
null,
false);
175 175 run(root,
List.of(
"git",
"config",
"--local",
"filter." + filter_name
+ ".required",
"true"),
null,
false);
176 + var merge_inputs
= win32
? "\\\"%O\\\" \\\"%A\\\" \\\"%B\\\"" : "\"%O\" \"%A\" \"%B\"";
176 177 run(root,
List.of(
"git",
"config",
"--local",
"merge." + filter_name
+ ".driver",
177 - "java " + aes
+ " merge --key-file " + key
+ " \"%O\" \"%A\" \"%B\""),
null,
false);
178 + "java " + aes
+ " merge --key-file " + key
+ " " + merge_inputs),
null,
false);
180 181 static String quote_shell(
String argument) {