diff options
author | René Scharfe <l.s.r@web.de> | 2022-12-01 23:49:11 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-12-02 00:25:29 +0100 |
commit | c5630c4868c74aab2fc4e8a4ef4bfc9c51534e0e (patch) | |
tree | 2cbb3d66b9213eb800acbf816a67a6861e73517a /diff-no-index.c | |
parent | Downmerge a bit more for 2.38.2 (diff) | |
download | git-c5630c4868c74aab2fc4e8a4ef4bfc9c51534e0e.tar.xz git-c5630c4868c74aab2fc4e8a4ef4bfc9c51534e0e.zip |
diff: factor out add_diff_options()
Add a function for appending the parseopts member of struct diff_options
to a struct option array. Use it in two sites instead of accessing the
parseopts member directly. Decoupling callers from diff internals like
that allows us to change the latter.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-no-index.c')
-rw-r--r-- | diff-no-index.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 18edbdf4b5..05fafd0019 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -255,8 +255,7 @@ int diff_no_index(struct rev_info *revs, }; struct option *options; - options = parse_options_concat(no_index_options, - revs->diffopt.parseopts); + options = add_diff_options(no_index_options, &revs->diffopt); argc = parse_options(argc, argv, revs->prefix, options, diff_no_index_usage, 0); if (argc != 2) { |