From 2b3ae04011c3d679ba601c7ef9e20b9dec125ebb Mon Sep 17 00:00:00 2001 From: Leon Michalak Date: Tue, 29 Jul 2025 07:01:51 +0000 Subject: add-patch: add diff.context command line overrides This patch compliments the previous commit, where builtins that use add-patch infrastructure now respect diff.context and diff.interHunkContext file configurations. In particular, this patch helps users who don't want to set persistent context configurations or just want a way to override them on a one-time basis, by allowing the relevant builtins to accept corresponding command line options that override the file configurations. This mimics commands such as diff and log, which allow for both context file configuration and command line overrides. Signed-off-by: Leon Michalak Signed-off-by: Junio C Hamano --- add-patch.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'add-patch.c') diff --git a/add-patch.c b/add-patch.c index b0125b51ba..302e6ba7d9 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1763,14 +1763,15 @@ soft_increment: } int run_add_p(struct repository *r, enum add_p_mode mode, - const char *revision, const struct pathspec *ps) + struct add_p_opt *o, const char *revision, + const struct pathspec *ps) { struct add_p_state s = { { r }, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT }; size_t i, binary_count = 0; - init_add_i_state(&s.s, r); + init_add_i_state(&s.s, r, o); if (mode == ADD_P_STASH) s.mode = &patch_mode_stash; -- cgit v1.3