diff options
| author | Leon Michalak <leonmichalak6@gmail.com> | 2025-07-29 07:01:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-29 08:52:45 -0700 |
| commit | 2b3ae04011c3d679ba601c7ef9e20b9dec125ebb (patch) | |
| tree | 42b7e6f556cf2e469fd80119cdb562cd60128b58 /add-patch.c | |
| parent | add-patch: respect diff.context configuration (diff) | |
| download | git-2b3ae04011c3d679ba601c7ef9e20b9dec125ebb.tar.gz git-2b3ae04011c3d679ba601c7ef9e20b9dec125ebb.zip | |
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 <leonmichalak6@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'add-patch.c')
| -rw-r--r-- | add-patch.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |