From: Leon Michalak <leonmichalak6@xxxxxxxxx>
Various builtins that use add-patch infrastructure do not respect
the user's diff.context and diff.interHunkContext file configurations.
This patch fixes this inconsistency.
Signed-off-by: Leon Michalak <leonmichalak6@xxxxxxxxx>
---
add-interactive.c | 17 ++++++++++
add-interactive.h | 1 +
add-patch.c | 6 ++++
t/t4055-diff-context.sh | 70 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 94 insertions(+)
diff --git a/add-interactive.c b/add-interactive.c
index 97ff35b6f12a..cac036441caf 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -39,8 +39,12 @@ static void init_color(struct repository *r, struct add_i_state *s,
void init_add_i_state(struct add_i_state *s, struct repository *r)
{
const char *value;
+ int context;
+ int interhunkcontext;
s->r = r;
+ s->context = -1;
+ s->interhunkcontext = -1;
if (repo_config_get_value(r, "color.interactive", &value))
s->use_color = -1;
@@ -78,6 +82,19 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
repo_config_get_string(r, "diff.algorithm",
&s->interactive_diff_algorithm);
+ if (!repo_config_get_int(r, "diff.context", &context)) {
+ if (context < 0)
+ die(_("%s cannot be negative"), "diff.context");
+ else
+ s->context = context;
+ };
+ if (!repo_config_get_int(r, "diff.interHunkContext", &interhunkcontext)) {
+ if (interhunkcontext < 0)
+ die(_("%s cannot be negative"), "diff.interHunkContext");
+ else
+ s->interhunkcontext = interhunkcontext;
+ };
+
repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);
if (s->use_single_key)
setbuf(stdin, NULL);
diff --git a/add-interactive.h b/add-interactive.h
index 693f125e8e4b..c63f35b14be8 100644
--- a/add-interactive.h
+++ b/add-interactive.h
@@ -18,6 +18,7 @@ struct add_i_state {
int use_single_key;
char *interactive_diff_filter, *interactive_diff_algorithm;
+ int context, interhunkcontext;
};
void init_add_i_state(struct add_i_state *s, struct repository *r);
diff --git a/add-patch.c b/add-patch.c
index 95c67d8c80c4..b43ca1600738 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -415,6 +415,8 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
{
struct strvec args = STRVEC_INIT;
const char *diff_algorithm = s->s.interactive_diff_algorithm;
+ int diff_context = s->s.context;
+ int diff_interhunkcontext = s->s.interhunkcontext;
struct strbuf *plain = &s->plain, *colored = NULL;
struct child_process cp = CHILD_PROCESS_INIT;
char *p, *pend, *colored_p = NULL, *colored_pend = NULL, marker = '\0';
@@ -424,6 +426,10 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
int res;
strvec_pushv(&args, s->mode->diff_cmd);
+ if (diff_context != -1)
+ strvec_pushf(&args, "--unified=%i", diff_context);
+ if (diff_interhunkcontext != -1)
+ strvec_pushf(&args, "--inter-hunk-context=%i", diff_interhunkcontext);
if (diff_algorithm)
strvec_pushf(&args, "--diff-algorithm=%s", diff_algorithm);
if (s->revision) {
diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh
index 1384a8195705..c4b861c360cc 100755
--- a/t/t4055-diff-context.sh
+++ b/t/t4055-diff-context.sh
@@ -52,6 +52,46 @@ test_expect_success 'diff.context honored by "log"' '
test_grep "^ firstline" output
'
+test_expect_success 'diff.context honored by "add"' '
+ git add -p >output &&
+ test_grep ! firstline output &&
+ test_config diff.context 8 &&
+ git log -1 -p >output &&
+ test_grep "^ firstline" output
+'
+
+test_expect_success 'diff.context honored by "commit"' '
+ ! git commit -p >output &&
+ test_grep ! firstline output &&
+ test_config diff.context 8 &&
+ ! git commit -p >output &&
+ test_grep "^ firstline" output
+'
+
+test_expect_success 'diff.context honored by "checkout"' '
+ git checkout -p >output &&
+ test_grep ! firstline output &&
+ test_config diff.context 8 &&
+ git checkout -p >output &&
+ test_grep "^ firstline" output
+'
+
+test_expect_success 'diff.context honored by "stash"' '
+ ! git stash -p >output &&
+ test_grep ! firstline output &&
+ test_config diff.context 8 &&
+ ! git stash -p >output &&
+ test_grep "^ firstline" output
+'
+
+test_expect_success 'diff.context honored by "restore"' '
+ git restore -p >output &&
+ test_grep ! firstline output &&
+ test_config diff.context 8 &&
+ git restore -p >output &&
+ test_grep "^ firstline" output
+'
+
test_expect_success 'The -U option overrides diff.context' '
test_config diff.context 8 &&
git log -U4 -1 >output &&
@@ -82,6 +122,36 @@ test_expect_success 'negative integer config parsing' '
test_grep "bad config variable" output
'
+test_expect_success 'negative integer config parsing by "add"' '
+ test_config diff.context -1 &&
+ test_must_fail git add -p 2>output &&
+ test_grep "diff.context cannot be negative" output
+'
+
+test_expect_success 'negative integer config parsing by "commit"' '
+ test_config diff.context -1 &&
+ test_must_fail git commit -p 2>output &&
+ test_grep "bad config variable" output
+'
+
+test_expect_success 'negative integer config parsing by "checkout"' '
+ test_config diff.context -1 &&
+ test_must_fail git checkout -p 2>output &&
+ test_grep "diff.context cannot be negative" output
+'
+
+test_expect_success 'negative integer config parsing by "stash"' '
+ test_config diff.context -1 &&
+ test_must_fail git stash -p 2>output &&
+ test_grep "diff.context cannot be negative" output
+'
+
+test_expect_success 'negative integer config parsing by "restore"' '
+ test_config diff.context -1 &&
+ test_must_fail git restore -p 2>output &&
+ test_grep "diff.context cannot be negative" output
+'
+
test_expect_success '-U0 is valid, so is diff.context=0' '
test_config diff.context 0 &&
git diff >output &&
--
gitgitgadget
