diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-19 03:46:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-19 03:46:17 +0100 |
| commit | ab91f6b7c42531406bcca0e48c48530126332142 (patch) | |
| tree | 3c77c78905448b44d73eda58d5157156cc669433 /diff.h | |
| parent | Merge branch 'jk/avoid-redef-system-functions' (diff) | |
| parent | diff: remove parseopts member from struct diff_options (diff) | |
| download | git-ab91f6b7c42531406bcca0e48c48530126332142.tar.xz git-ab91f6b7c42531406bcca0e48c48530126332142.zip | |
Merge branch 'rs/diff-parseopts'
The way the diff machinery prepares the options array for the
parse_options API has been refactored to avoid resource leaks.
* rs/diff-parseopts:
diff: remove parseopts member from struct diff_options
diff: use add_diff_options() in diff_opt_parse()
diff: factor out add_diff_options()
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -394,7 +394,6 @@ struct diff_options { unsigned color_moved_ws_handling; struct repository *repo; - struct option *parseopts; struct strmap *additional_path_headers; int no_free; @@ -539,6 +538,7 @@ int git_diff_ui_config(const char *var, const char *value, void *cb); #define diff_setup(diffopts) repo_diff_setup(the_repository, diffopts) #endif void repo_diff_setup(struct repository *, struct diff_options *); +struct option *add_diff_options(const struct option *, struct diff_options *); int diff_opt_parse(struct diff_options *, const char **, int, const char *); void diff_setup_done(struct diff_options *); int git_config_rename(const char *var, const char *value); |