git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-06-16 04:07:36 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

userdiff: add diff.<driver>.process config

Browse Source 
Add the process field to struct userdiff_driver and teach the
config parser to populate it from diff.<driver>.process.

Signed-off-by: Michael Montalbo <mmontalbo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Montalbo
2026-06-14 18:59:19 +00:00
committed by Junio C Hamano
parent 60eb74a526
commit bb4bd350ba
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
userdiff.c
View File

@@ -509,6 +509,13 @@ int userdiff_config(const char *k, const char *v)
drv->algorithm = drv->algorithm_owned;
return ret;
}
if (!strcmp(type, "process")) {
int ret;
FREE_AND_NULL(drv->process_owned);
ret = git_config_string(&drv->process_owned, k, v);
drv->process = drv->process_owned;
return ret;
}
return 0;
}

2
userdiff.h
View File

@@ -31,6 +31,8 @@ struct userdiff_driver {
char *textconv_owned;
struct notes_cache *textconv_cache;
int textconv_want_cache;
const char *process;
char *process_owned;
};
enum userdiff_driver_type {
USERDIFF_DRIVER_TYPE_BUILTIN = 1<<0,