dotfiles

bugabingas dorkfiles

owned by admin

fix(crypto): preserve merge driver quotes on Windows

5cb57f4d55138fb2e3aaedd4266c14aec0b77017

Oliver Krylow <o.krylow@isp-insoft.de> · 2026-08-31 10:57 UTC

unsigned 1 parent

ready

@@ -173,8 +173,9 @@

run(root, List.of("git", "config", "--local", "filter." + filter_name + ".smudge",

"java " + aes + " decrypt --key-file " + key), null, false);

run(root, List.of("git", "config", "--local", "filter." + filter_name + ".required", "true"), null, false);

+ var merge_inputs = win32 ? "\\\"%O\\\" \\\"%A\\\" \\\"%B\\\"" : "\"%O\" \"%A\" \"%B\"";

run(root, List.of("git", "config", "--local", "merge." + filter_name + ".driver",

- "java " + aes + " merge --key-file " + key + " \"%O\" \"%A\" \"%B\""), null, false);

+ "java " + aes + " merge --key-file " + key + " " + merge_inputs), null, false);

}

static String quote_shell(String argument) {