Better support for customising context lines in --patch commands

This series of patches attempt to give --interactive/--patch compatible builtins ("add", "commit", "checkout", "reset", "restore" and "stash") better support and nicer experience for configuring how many context lines are shown in diffs through a variety of ways.

Prior to these patches, the user could not choose how many context lines they saw in --patch commands (apart from one workaround by using GIT_DIFF_OPTS=-u<number> ..., however this isn't a good user experience or a persistent solution). Additionally, the behaviour around reading from the diff.context and diff.interHunkContext configs was also inconsistent with other diff generating commands such as "log -p".

The summarised changes below hopefully make this experience better and fix some inconsistencies:

* diff.context and diff.interHunkContext configs are now respected by --patch compatible commands
* --unified and --inter-hunk-context command line options have been added to --patch compatible commands (which take prescendence over file configs)
* "add" and "commit" in --interactive mode now expose a new "context" subcommand which configures the amount of context lines you wish to see in subsequent diffs generated from other subcommands such as "patch" or "diff"

The original discussion for this can be read at:

* https://lore.kernel.org/git/CAP9jKjGb-Rcr=RLJEzeFdtrekYM+qmHy+1T1fykU3n9cV4GhGw@mail.gmail.com/

Leon Michalak (3):
add-patch: respect diff.context configuration
add-patch: add diff.context command line overrides
add-interactive: add new "context" subcommand

 Documentation/git-add.adoc      |  21 ++++++-
 Documentation/git-checkout.adoc |  11 ++++
 Documentation/git-commit.adoc   |  11 ++++
 Documentation/git-reset.adoc    |  11 ++++
 Documentation/git-restore.adoc  |  11 ++++
 Documentation/git-stash.adoc    |  11 ++++
 add-interactive.c               | 107 +++++++++++++++++++++++++++++---
 add-interactive.h               |  17 ++++-
 add-patch.c                     |  11 +++-
 builtin/add.c                   |  21 +++++--
 builtin/checkout.c              |  28 ++++++++-
 builtin/commit.c                |  15 ++++-
 builtin/reset.c                 |  16 ++++-
 builtin/stash.c                 |  54 ++++++++++++----
 commit.h                        |   3 +-
 t/t3701-add-interactive.sh      |  36 +++++++++--
 t/t4055-diff-context.sh         |  78 ++++++++++++++++++++++-
 t/t9902-completion.sh           |   2 +
 18 files changed, 420 insertions(+), 44 deletions(-)

base-commit: f65182a99e545d2f2bc22e6c1c2da192133b16a3
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1915%2FNinjaInShade%2Finteractive-patch-context-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1915/NinjaInShade/interactive-patch-context-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1915

gitgitgadget

From: Leon Michalak <[email protected]>

This aims to teach relevant builtins (that take in --patch) to respect the user's diff.context and diff.interHunkContext file configurations.

Since these are both UI options and --patch is designed for the end user, I believe this was previously just an inconsistency, which this patch hopes to address.

---
 add-interactive.c       | 16 ++++++++++----
 add-patch.c             |  6 ++++++
 t/t4055-diff-context.sh | 48 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 65 insertions(+), 5 deletions(-)

index 97ff35b6f12a..ad12dc416598 100644
@@ -41,6 +41,8 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
 	const char *value;
 
 	s->r = r;
+	s->context = -1;
+	s->interhunkcontext = -1;
 
 	if (repo_config_get_value(r, "color.interactive", &value))
 		s->use_color = -1;

@@ -78,6 +80,9 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
 	repo_config_get_string(r, "diff.algorithm",
 			       &s->interactive_diff_algorithm);
 
+	repo_config_get_int(r, "diff.context", &s->context);
+	repo_config_get_int(r, "diff.interHunkContext", &s->interhunkcontext);
+
 	repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);
 	if (s->use_single_key)
 		setbuf(stdin, NULL);

@@ -1014,10 +1019,13 @@ static int run_diff(struct add_i_state *s, const struct pathspec *ps,
 	if (count > 0) {
 		struct child_process cmd = CHILD_PROCESS_INIT;
 
-		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached",
-			     oid_to_hex(!is_initial ? &oid :
-					s->r->hash_algo->empty_tree),
-			     "--", NULL);
+		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached", NULL);
+		if (s->context != -1)
+			strvec_pushf(&cmd.args, "--unified=%i", s->context);
+		if (s->interhunkcontext != -1)
+			strvec_pushf(&cmd.args, "--inter-hunk-context=%i", s->interhunkcontext);
+		strvec_pushl(&cmd.args, oid_to_hex(!is_initial ? &oid :
+			     s->r->hash_algo->empty_tree), "--", NULL);
 		for (i = 0; i < files->items.nr; i++)
 			if (files->selected[i])
 				strvec_push(&cmd.args,

index 95c67d8c80c4..b43ca1600738 100644
@@ -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) {

gitgitgadget

From: Leon Michalak <[email protected]>

This patch compliments 8b91eef812, where builtins that accept --patch options 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 diff which allows for both context file configuration and command line overrides.

---
 Documentation/git-add.adoc      | 11 +++++++
 Documentation/git-checkout.adoc | 11 +++++++
 Documentation/git-commit.adoc   | 11 +++++++
 Documentation/git-reset.adoc    | 11 +++++++
 Documentation/git-restore.adoc  | 11 +++++++
 Documentation/git-stash.adoc    | 11 +++++++
 add-interactive.c               | 19 +++++++++---
 add-interactive.h               | 17 +++++++++--
 add-patch.c                     |  5 +--
 builtin/add.c                   | 21 ++++++++++---
 builtin/checkout.c              | 28 +++++++++++++++--
 builtin/commit.c                | 15 ++++++++-
 builtin/reset.c                 | 16 ++++++++--
 builtin/stash.c                 | 54 ++++++++++++++++++++++++++-------
 commit.h                        |  3 +-
 t/t4055-diff-context.sh         | 30 ++++++++++++++++++
 t/t9902-completion.sh           |  2 ++
 17 files changed, 245 insertions(+), 31 deletions(-)

index eba0b419ce50..e3a50706acd5 100644
@@ -104,6 +104,17 @@ This effectively runs `add --interactive`, but bypasses the
 initial command menu and directly jumps to the `patch` subcommand.
 See ``Interactive mode'' for details.
 
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset. Implies `--interactive/--patch`.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset. Implies `--interactive/--patch`.
+
 `-e`::
 `--edit`::
 	Open the diff vs. the index in an editor and let the user

index a66c53a5cd1e..46286a6c8c9e 100644
@@ -289,6 +289,17 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
 Note that this option uses the no overlay mode by default (see also
 `--overlay`), and currently doesn't support overlay mode.
 
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset. Implies `--patch`.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset. Implies `--patch`.
+
 --ignore-other-worktrees::
 	`git checkout` refuses when the wanted branch is already checked
 	out or otherwise in use by another worktree. This option makes

index dc219025f1eb..c0b206aee9c9 100644
@@ -76,6 +76,17 @@ OPTIONS
 	which changes to commit. See linkgit:git-add[1] for
 	details.
 
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset. Implies `--interactive/--patch`.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset. Implies `--interactive/--patch`.
+
 `-C <commit>`::
 `--reuse-message=<commit>`::
 	Take an existing _<commit>_ object, and reuse the log message

index 53ab88c5451c..6fcc86a3b960 100644
@@ -125,6 +125,17 @@ OPTIONS
 	separated with _NUL_ character and all other characters are taken
 	literally (including newlines and quotes).
 
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset. Implies `--patch`.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset. Implies `--patch`.
+
 `--`::
 	Do not interpret any more arguments as options.
 

index 877b7772e667..49d7e6b5a5c8 100644
@@ -52,6 +52,17 @@ leave out at most one of _<rev-A>__ and _<rev-B>_, in which case it defaults to
 	Mode" section of linkgit:git-add[1] to learn how to operate
 	the `--patch` mode.
 
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset. Implies `--patch`.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset. Implies `--patch`.
+
 `-W`::
 `--worktree`::
 `-S`::

index 1a5177f4986c..24916fa0723e 100644
@@ -208,6 +208,17 @@ to learn how to operate the `--patch` mode.
 The `--patch` option implies `--keep-index`.  You can use
 `--no-keep-index` to override this.
 
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset. Implies `--patch`.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset. Implies `--patch`.
+
 -S::
 --staged::
 	This option is only valid for `push` and `save` commands.

index ad12dc416598..1ea8eb711a60 100644
@@ -36,7 +36,8 @@ static void init_color(struct repository *r, struct add_i_state *s,
 	free(key);
 }
 
-void init_add_i_state(struct add_i_state *s, struct repository *r)
+void init_add_i_state(struct add_i_state *s, struct repository *r,
+		      struct add_p_opt *add_p_opt)
 {
 	const char *value;
 

@@ -86,6 +87,11 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
 	repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);
 	if (s->use_single_key)
 		setbuf(stdin, NULL);
+
+	if (add_p_opt->context != -1)
+		s->context = add_p_opt->context;
+	if (add_p_opt->interhunkcontext != -1)
+		s->interhunkcontext = add_p_opt->interhunkcontext;
 }
 
 void clear_add_i_state(struct add_i_state *s)

@@ -974,6 +980,10 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
 	opts->prompt = N_("Patch update");
 	count = list_and_choose(s, files, opts);
 	if (count > 0) {
+		struct add_p_opt add_p_opt = {
+			.context = s->context,
+			.interhunkcontext = s->interhunkcontext,
+		};
 		struct strvec args = STRVEC_INIT;
 		struct pathspec ps_selected = { 0 };
 

@@ -984,7 +994,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
 		parse_pathspec(&ps_selected,
 			       PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
 			       PATHSPEC_LITERAL_PATH, "", args.v);
-		res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected);
+		res = run_add_p(s->r, ADD_P_ADD, &add_p_opt, NULL, &ps_selected);
 		strvec_clear(&args);
 		clear_pathspec(&ps_selected);
 	}

@@ -1118,7 +1128,8 @@ static void command_prompt_help(struct add_i_state *s)
 			 _("(empty) select nothing"));
 }
 
-int run_add_i(struct repository *r, const struct pathspec *ps)
+int run_add_i(struct repository *r, const struct pathspec *ps,
+	      struct add_p_opt *add_p_opt)
 {
 	struct add_i_state s = { NULL };
 	struct print_command_item_data data = { "[", "]" };

@@ -1161,7 +1172,7 @@ int run_add_i(struct repository *r, const struct pathspec *ps)
 			->util = util;
 	}
 
-	init_add_i_state(&s, r);
+	init_add_i_state(&s, r, add_p_opt);
 
 	/*
 	 * When color was asked for, use the prompt color for

index 693f125e8e4b..653f07a917b8 100644
@@ -3,6 +3,13 @@
 
 #include "color.h"
 
+#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1 }
+
+struct add_p_opt {
+	int context;
+	int interhunkcontext;
+};
+
 struct add_i_state {
 	struct repository *r;
 	int use_color;

@@ -18,14 +25,17 @@ 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);
+void init_add_i_state(struct add_i_state *s, struct repository *r,
+		      struct add_p_opt *add_p_opt);
 void clear_add_i_state(struct add_i_state *s);
 
 struct repository;
 struct pathspec;
-int run_add_i(struct repository *r, const struct pathspec *ps);
+int run_add_i(struct repository *r, const struct pathspec *ps,
+	      struct add_p_opt *add_p_opt);
 
 enum add_p_mode {
 	ADD_P_ADD,

@@ -36,6 +46,7 @@ enum add_p_mode {
 };
 
 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);
 
 #endif

index b43ca1600738..c0d33820c558 100644
@@ -1766,14 +1766,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;

index 78dfb2657767..9b4e618b3fe2 100644
@@ -29,6 +29,7 @@ static const char * const builtin_add_usage[] = {
 	NULL
 };
 static int patch_interactive, add_interactive, edit_interactive;
+static struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
 static int take_worktree_changes;
 static int add_renormalize;
 static int pathspec_file_nul;

@@ -157,7 +158,7 @@ static int refresh(struct repository *repo, int verbose, const struct pathspec *
 int interactive_add(struct repository *repo,
 		    const char **argv,
 		    const char *prefix,
-		    int patch)
+		    int patch, struct add_p_opt *add_p_opt)
 {
 	struct pathspec pathspec;
 	int ret;

@@ -169,9 +170,10 @@ int interactive_add(struct repository *repo,
 		       prefix, argv);
 
 	if (patch)
-		ret = !!run_add_p(repo, ADD_P_ADD, NULL, &pathspec);
+		ret = !!run_add_p(repo, ADD_P_ADD, add_p_opt, NULL,
+				  &pathspec);
 	else
-		ret = !!run_add_i(repo, &pathspec);
+		ret = !!run_add_i(repo, &pathspec, add_p_opt);
 
 	clear_pathspec(&pathspec);
 	return ret;

@@ -253,6 +255,12 @@ static struct option builtin_add_options[] = {
 	OPT_GROUP(""),
 	OPT_BOOL('i', "interactive", &add_interactive, N_("interactive picking")),
 	OPT_BOOL('p', "patch", &patch_interactive, N_("select hunks interactively")),
+	OPT_INTEGER_F('U', "unified", &add_p_opt.context,
+		      N_("generate diffs with <n> lines context, implies --interactive/--patch"),
+		      PARSE_OPT_NONEG),
+	OPT_INTEGER_F(0, "inter-hunk-context", &add_p_opt.interhunkcontext,
+		      N_("show context between diff hunks up to the specified number of lines, implies --interactive/--patch"),
+		      PARSE_OPT_NONEG),
 	OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")),
 	OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files"), 0),
 	OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")),

@@ -398,7 +406,12 @@ int cmd_add(int argc,
 			die(_("options '%s' and '%s' cannot be used together"), "--dry-run", "--interactive/--patch");
 		if (pathspec_from_file)
 			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
-		exit(interactive_add(repo, argv + 1, prefix, patch_interactive));
+		exit(interactive_add(repo, argv + 1, prefix, patch_interactive, &add_p_opt));
+	} else {
+		if (add_p_opt.context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--interactive/--patch");
+		if (add_p_opt.interhunkcontext != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--interactive/--patch");
 	}
 
 	if (edit_interactive) {

index d185982f3a63..22bd7b1d2b3b 100644
@@ -61,6 +61,8 @@ static const char * const restore_usage[] = {
 
 struct checkout_opts {
 	int patch_mode;
+	int patch_context;
+	int patch_interhunk_context;
 	int quiet;
 	int merge;
 	int force;

@@ -104,7 +106,12 @@ struct checkout_opts {
 	struct tree *source_tree;
 };
 
-#define CHECKOUT_OPTS_INIT { .conflict_style = -1, .merge = -1 }
+#define CHECKOUT_OPTS_INIT { \
+	.conflict_style = -1, \
+	.merge = -1, \
+	.patch_context = -1, \
+	.patch_interhunk_context = -1, \
+}
 
 struct branch_info {
 	char *name; /* The short name used */

@@ -539,6 +546,10 @@ static int checkout_paths(const struct checkout_opts *opts,
 
 	if (opts->patch_mode) {
 		enum add_p_mode patch_mode;
+		struct add_p_opt add_p_opt = {
+			.context = opts->patch_context,
+			.interhunkcontext = opts->patch_interhunk_context,
+		};
 		const char *rev = new_branch_info->name;
 		char rev_oid[GIT_MAX_HEXSZ + 1];
 

@@ -564,8 +575,13 @@ static int checkout_paths(const struct checkout_opts *opts,
 		else
 			BUG("either flag must have been set, worktree=%d, index=%d",
 			    opts->checkout_worktree, opts->checkout_index);
-		return !!run_add_p(the_repository, patch_mode, rev,
-				   &opts->pathspec);
+		return !!run_add_p(the_repository, patch_mode, &add_p_opt,
+				   rev, &opts->pathspec);
+	} else {
+		if (opts->patch_context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
+		if (opts->patch_interhunk_context != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
 	}
 
 	repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);

@@ -1738,6 +1754,12 @@ static struct option *add_checkout_path_options(struct checkout_opts *opts,
 			      N_("checkout their version for unmerged files"),
 			      3, PARSE_OPT_NONEG),
 		OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")),
+		OPT_INTEGER_F('U', "unified", &opts->patch_context,
+			N_("generate diffs with <n> lines context, implies --patch"),
+			PARSE_OPT_NONEG),
+		OPT_INTEGER_F(0, "inter-hunk-context", &opts->patch_interhunk_context,
+			N_("show context between diff hunks up to the specified number of lines, implies --patch"),
+			PARSE_OPT_NONEG),
 		OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree,
 			 N_("do not limit pathspecs to sparse entries only")),
 		OPT_PATHSPEC_FROM_FILE(&opts->pathspec_from_file),

index 66bd91fd523d..5831fd019717 100644
@@ -19,6 +19,7 @@
 #include "environment.h"
 #include "diff.h"
 #include "commit.h"
+#include "add-interactive.h"
 #include "gettext.h"
 #include "revision.h"
 #include "wt-status.h"

@@ -122,6 +123,7 @@ static const char *edit_message, *use_message;
 static char *fixup_message, *fixup_commit, *squash_message;
 static const char *fixup_prefix;
 static int all, also, interactive, patch_interactive, only, amend, signoff;
+static struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
 static int edit_flag = -1; /* unspecified */
 static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
 static int config_commit_verbose = -1; /* unspecified */

@@ -400,7 +402,7 @@ static const char *prepare_index(const char **argv, const char *prefix,
 		old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
 		setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
 
-		if (interactive_add(the_repository, argv, prefix, patch_interactive) != 0)
+		if (interactive_add(the_repository, argv, prefix, patch_interactive, &add_p_opt) != 0)
 			die(_("interactive add failed"));
 
 		the_repository->index_file = old_repo_index_file;

@@ -424,6 +426,11 @@ static const char *prepare_index(const char **argv, const char *prefix,
 		commit_style = COMMIT_NORMAL;
 		ret = get_lock_file_path(&index_lock);
 		goto out;
+	} else {
+		if (add_p_opt.context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--interactive/--patch");
+		if (add_p_opt.interhunkcontext != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--interactive/--patch");
 	}
 
 	/*

@@ -1722,6 +1729,12 @@ int cmd_commit(int argc,
 		OPT_BOOL('i', "include", &also, N_("add specified files to index for commit")),
 		OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
 		OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
+		OPT_INTEGER_F('U', "unified", &add_p_opt.context,
+			      N_("generate diffs with <n> lines context, implies --interactive/--patch"),
+			      PARSE_OPT_NONEG),
+		OPT_INTEGER_F(0, "inter-hunk-context", &add_p_opt.interhunkcontext,
+			      N_("show context between diff hunks up to the specified number of lines, implies --interactive/--patch"),
+			      PARSE_OPT_NONEG),
 		OPT_BOOL('o', "only", &only, N_("commit only specified files")),
 		OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
 		OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),

index 73b4537a9a56..ee39d6277381 100644
@@ -346,6 +346,7 @@ int cmd_reset(int argc,
 	struct object_id oid;
 	struct pathspec pathspec;
 	int intent_to_add = 0;
+	struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
 	const struct option options[] = {
 		OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 		OPT_BOOL(0, "no-refresh", &no_refresh,

@@ -370,6 +371,12 @@ int cmd_reset(int argc,
 			       PARSE_OPT_OPTARG,
 			       option_parse_recurse_submodules_worktree_updater),
 		OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
+		OPT_INTEGER_F('U', "unified", &add_p_opt.context,
+			       N_("generate diffs with <n> lines context, implies --patch"),
+			       PARSE_OPT_NONEG),
+		OPT_INTEGER_F(0, "inter-hunk-context", &add_p_opt.interhunkcontext,
+			       N_("show context between diff hunks up to the specified number of lines, implies --patch"),
+			       PARSE_OPT_NONEG),
 		OPT_BOOL('N', "intent-to-add", &intent_to_add,
 				N_("record only the fact that removed paths will be added later")),
 		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),

@@ -424,9 +431,14 @@ int cmd_reset(int argc,
 		if (reset_type != NONE)
 			die(_("options '%s' and '%s' cannot be used together"), "--patch", "--{hard,mixed,soft}");
 		trace2_cmd_mode("patch-interactive");
-		update_ref_status = !!run_add_p(the_repository, ADD_P_RESET, rev,
-				   &pathspec);
+		update_ref_status = !!run_add_p(the_repository, ADD_P_RESET,
+						&add_p_opt, rev, &pathspec);
 		goto cleanup;
+	} else {
+		if (add_p_opt.context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
+		if (add_p_opt.interhunkcontext != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
 	}
 
 	/* git reset tree [--] paths... can be used to

index 70c870dae4d4..7a7fedbc2f14 100644
@@ -2,6 +2,7 @@
 #define COMMIT_H
 
 #include "object.h"
+#include "add-interactive.h"
 
 struct signature_check;
 struct strbuf;

@@ -257,7 +258,7 @@ int for_each_commit_graft(each_commit_graft_fn, void *);
 int interactive_add(struct repository *repo,
 		    const char **argv,
 		    const char *prefix,
-		    int patch);
+		    int patch, struct add_p_opt *add_p_opt);
 
 struct commit_extra_header {
 	struct commit_extra_header *next;

index 9c024200ade7..1c1e62b434ec 100755
@@ -104,6 +104,36 @@ test_expect_success 'The -U option overrides diff.context' '
 	! grep "^ firstline" output
 '
 
+test_expect_success 'The -U option overrides diff.context for "add"' '
+	git config diff.context 8 &&
+	git add -U4 -p >output &&
+	! grep "^ firstline" output
+'
+
+test_expect_success 'The -U option overrides diff.context for "commit"' '
+	git config diff.context 8 &&
+	! git commit -U4 -p >output &&
+	! grep "^ firstline" output
+'
+
+test_expect_success 'The -U option overrides diff.context for "checkout"' '
+	git config diff.context 8 &&
+	git checkout -U4 -p >output &&
+	! grep "^ firstline" output
+'
+
+test_expect_success 'The -U option overrides diff.context for "stash"' '
+	git config diff.context 8 &&
+	! git stash -U4 -p >output &&
+	! grep "^ firstline" output
+'
+
+test_expect_success 'The -U option overrides diff.context for "restore"' '
+	git config diff.context 8 &&
+	git restore -U4 -p >output &&
+	! grep "^ firstline" output
+'
+
 test_expect_success 'diff.context honored by "diff"' '
 	git config diff.context 8 &&
 	git diff >output &&

index 343b8cd1912b..6650d33fba69 100755
@@ -2596,6 +2596,8 @@ test_expect_success 'double dash "git checkout"' '
 	--merge Z
 	--conflict=Z
 	--patch Z
+	--unified=Z
+	--inter-hunk-context=Z
 	--ignore-skip-worktree-bits Z
 	--ignore-other-worktrees Z
 	--recurse-submodules Z

gitgitgadget

From: Leon Michalak <[email protected]>

This teaches add/commit --interactive a new "context" subcommand, which changes the amount of context lines subsequent subcommands like "patch" or "diff" generate in their diffs.

---
 Documentation/git-add.adoc | 10 ++++--
 add-interactive.c          | 72 +++++++++++++++++++++++++++++++++++++-
 t/t3701-add-interactive.sh | 36 ++++++++++++++++---
 3 files changed, 110 insertions(+), 8 deletions(-)

index e3a50706acd5..1ab98c9b876e 100644
@@ -265,14 +265,15 @@ and type return, like this:
 ------------
     *** Commands ***
       1: status       2: update       3: revert       4: add untracked
-      5: patch        6: diff         7: quit         8: help
+      5: patch        6: diff         7: context      8: quit
+      9: help
     What now> 1
 ------------
 
 You also could say `s` or `sta` or `status` above as long as the
 choice is unique.
 
-The main command loop has 6 subcommands (plus help and quit).
+The main command loop has 7 subcommands (plus help and quit).
 
 status::
 

@@ -373,6 +374,11 @@ diff::
   This lets you review what will be committed (i.e. between
   `HEAD` and index).
 
+context::
+
+  This lets you change the amount of context lines shown in diffs that
+  the 'patch' and 'diff' subcommands generate.
+
 
 EDITING PATCHES
 ---------------

index b8a05d95f3f1..9dcbc07d5876 100755
@@ -758,16 +758,19 @@ test_expect_success 'colors can be overridden' '
 
 	<RED>*** Commands ***<RESET>
 	  1: <YELLOW>s<RESET>tatus	  2: <YELLOW>u<RESET>pdate	  3: <YELLOW>r<RESET>evert	  4: <YELLOW>a<RESET>dd untracked
-	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>q<RESET>uit	  8: <YELLOW>h<RESET>elp
+	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>c<RESET>ontext	  8: <YELLOW>q<RESET>uit
+	  9: <YELLOW>h<RESET>elp
 	<YELLOW>What now<RESET>> <GREEN>status        - show paths with changes<RESET>
 	<GREEN>update        - add working tree state to the staged set of changes<RESET>
 	<GREEN>revert        - revert staged set of changes back to the HEAD version<RESET>
 	<GREEN>patch         - pick hunks and update selectively<RESET>
 	<GREEN>diff          - view diff between HEAD and index<RESET>
+	<GREEN>context       - change how many context lines diffs are generated with<RESET>
 	<GREEN>add untracked - add contents of untracked files to the staged set of changes<RESET>
 	<RED>*** Commands ***<RESET>
 	  1: <YELLOW>s<RESET>tatus	  2: <YELLOW>u<RESET>pdate	  3: <YELLOW>r<RESET>evert	  4: <YELLOW>a<RESET>dd untracked
-	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>q<RESET>uit	  8: <YELLOW>h<RESET>elp
+	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>c<RESET>ontext	  8: <YELLOW>q<RESET>uit
+	  9: <YELLOW>h<RESET>elp
 	<YELLOW>What now<RESET>> Bye.
 	EOF
 	test_cmp expect actual &&

@@ -831,7 +834,8 @@ test_expect_success 'brackets appear without color' '
 	|
 	|*** Commands ***
 	|  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-	|  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+	|  5: [p]atch	  6: [d]iff	  7: [c]ontext	  8: [q]uit
+	|  9: [h]elp
 	|What now> Bye.
 	EOF
 

@@ -1172,16 +1176,19 @@ test_expect_success 'show help from add--helper' '
 
 	<BOLD>*** Commands ***<RESET>
 	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
-	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
+	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>c<RESET>ontext	  8: <BOLD;BLUE>q<RESET>uit
+	  9: <BOLD;BLUE>h<RESET>elp
 	<BOLD;BLUE>What now<RESET>> <BOLD;RED>status        - show paths with changes<RESET>
 	<BOLD;RED>update        - add working tree state to the staged set of changes<RESET>
 	<BOLD;RED>revert        - revert staged set of changes back to the HEAD version<RESET>
 	<BOLD;RED>patch         - pick hunks and update selectively<RESET>
 	<BOLD;RED>diff          - view diff between HEAD and index<RESET>
+	<BOLD;RED>context       - change how many context lines diffs are generated with<RESET>
 	<BOLD;RED>add untracked - add contents of untracked files to the staged set of changes<RESET>
 	<BOLD>*** Commands ***<RESET>
 	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
-	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
+	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>c<RESET>ontext	  8: <BOLD;BLUE>q<RESET>uit
+	  9: <BOLD;BLUE>h<RESET>elp
 	<BOLD;BLUE>What now<RESET>>$SP
 	Bye.
 	EOF

@@ -1230,4 +1237,23 @@ test_expect_success 'hunk splitting works with diff.suppressBlankEmpty' '
 	test_cmp expect actual
 '
 
+test_expect_success 'change context works' '
+	git reset --hard &&
+	cat >template <<-\EOF &&
+	firstline
+	preline
+	TARGET
+	postline
+	lastline
+	EOF
+	sed "/TARGET/d" >x <template &&
+	git update-index --add x &&
+	git commit -m initial &&
+	sed "s/TARGET/ADDED/" >x <template &&
+	test_write_lines p 1 | git add -i >output &&
+	grep firstline output &&
+	test_write_lines c 0 p 1 | git add -i >output &&
+	! grep firstline output
+'
+
 test_done

gitgitgadget

8b91eef812 is patch 1. This hash will change once the patches have been imported via git-am(1). So it won’t make sense when these patches land as commits.

I think the usual approach is to refer to a previous commit in the series as “in a previous commit we...”. Or maybe “in the previous commit” for this patch and “two commits ago” for patch 3.

For commits that are in the stable history (like master) the convention is to use:

    git show -s --pretty=reference <commit>

Without backticks (`). See SubmittingPatches, commit-reference.

Thanks! Part of me did wonder if the reference would be updated when merging, but I can see now the correct way to approach this.

This being my first ever contribution, I hope I am at least a little forgiven for any mistakes, which of course I'm more than happy to correct and learn from.

Valid points, I don't think I have any objections to anything listed.

Would it be recommended to update to test_grep (and test_config from previous message) in the same test files whilst I'm at it?

Thanks for the review :)

Please don't "top post" and reply inline instead (see
https://en.wikipedia.org/wiki/Posting_style) as it's the standard on this list.

If you want to replace pre existing "grep" commands with "test_grep" and pre existing git config with test_config, I would recommend doing it in preparatory patches that go first in your patch series.

Thanks!

Hi Leon

Thanks for working on this. I've left a few comments below but for your first submission this is very good.

This is a good summary of the intent of the patch. I'd maybe drop "This aims" and instead say that the various commands do not respect the config and this patch fixes that.

Hmph, in the real UI, the first letters of these commands (which have deliberately been chosen to be unique) are shown in different color to hint that the answer to the prompt can be like 's' (for status). I would hate to see that quit/help, which are somewhat special, move from the very end position.

Perhaps the example of the documentation page shown above should respond with 's', not '1' to show more prominently that it is possible and encouraged? I dunno.

That is a valid concern.

's' is taken for 'status', so it shouldn't be '9: settings' (it should come before 'quit' instead), but I think I know where you are going.

An alternative that may work better is to allow subcommand specific parameters in the answer to the "What now>" prompt, e.g.

What now> r -U7

to choose an equivalent to "git revert -p -U7".

Thanks.

Thanks, I rarely use email like this so overlooked this aspect. I hope this email is better? If not let me know.

Yes that makes sense :)

This is the main reason I chose to put the new subcommand before as I also feel quit/help are better suited to be last, although I do see the argument against muscle memory and is valid.

Writing the first letters as opposed to the numbers is how I personally use this, just to add another perspective.

Would "config" as opposed to "settings" fix the unique lettering problem? Or perhaps config is not the best description for what it would do (I sometimes find myself using config/settings interchangeably but the majority may not...)?

Overall I feel the first two patches cover my use case the most so I am also not opposed to completely dropping the last patch about the --interactive context subcommand. Inherited diff context and command line overrides I feel are a great base to begin with either way. Just some thoughts :)

The usual way to compose a log message of this project is to

- Give an observation on how the current system works in the present tense (so no need to say "Currently X is Y", just "X is Y"), and discuss what you perceive as a problem in it.

- Propose a solution (optional---often, problem description trivially leads to an obvious solution in reader's minds).

- Give commands to the codebase to "become like so".

in this order. "Various built-in commands that use add-patch infrastructure do not honor diff.context and diff.interHunkContext configuration variables." Would be the first sentence to explain the current situation. Follow that sentence with an explanation why it is a bad thing (i.e. it is possible that "do not honor" may be a deliberate design decision---perhaps the implementation of "add -p" is impossible if it has to honor diff.context that is set to 0; show evidence that no such deliberate design decision was there when the feature was introduced from the list archive, and say that not honoring the configuration is an inconvenient inconsistency).

Such an explanation would be sufficient for readers to guess the "solution", so stopping there should be fine.

Thanks.

	test_expect_success title '
		test_config diff.context 8 &&
		do your tests
	'

	test_expect_success title '
		test_when_finished "git config unset diff.context" &&
		git config set diff.context 8 &&
		do your tests
	'

Hi Leon

I'm somewhat torn about the name "--unified" as I don't think it is particularly informative - it only makes sense if one knows the diff option and we only support a single diff format. Having said that it is probably better to reuse the name from "git diff" for consistency.

    git rebase --keep-base --exec 'make && cd t && prove -j8 

I think the best solution would be to allow users to re-display the current hunk with more context inside "add -p" rather than changing "add -i". That way a user who needs more context to make a decision on the current hunk can get it without restarting the whole process of selecting hunks [1]. If the user knows up front that they want a certain amount of context they can use "git add -p -U <context>" or "git add -i -U <context>" which was added in the preceding patch.

Best Wishes

Phillip

[1] With "git add -p" they can quit and carry on from where they left off but "git stash -p" doesn't let you amend an existing stash and git refuses to pop a stash if the working tree is dirty. This means if a stash is split in two because the user exited to change the context they cannot pop both stashes on top of each other.

Excellent suggestion.

I however think "-U implies -i/-p" makes no sense at all. What if the user said "git add -U6"? Do we run "git add -i -U6" or go directly to "git add -p -U6"?

I think it is better to encourage the user to be more explicit to require them to say "git revert -U6 -p" or "git add -U6 -i".

If -U<n> is given and there is no "-i" (for "add" only) or "-p" (for everything), just error out *until* other modes of these commands find a good use of context width information, at which point we can use the context length information to drive these commands in their non-"patch" mode.

Even if we cannot think of a way to use the diff output (and with configurable context length) in modes that are not "--patch" for these commands RIGHT NOW, that does not mean -U<n> would never become useful in these modes for the commands. Let's not close the door prematurely from our future developers by making -U<n> imply anything, and make it an error to use -U<N> without -p/-i for now.

I think I may be misunderstanding, so I'll elaborate on what I personally intended my documentation to mean.

When I put in the documentation "implies --interactive/--patch" it reads to me as "this assumes you are also using either --interactive or --patch and that if you don't specify one or the other it will do nothing or possibly error (which is what I chose in the end, based on the initial discussion in a separate thread)". I didn't think it would read as "you must have both settings" or "if you don't specify these the command will assume it as if you had and effectively act as if you had".

I'm not sure if the wording was confusing or it generally has different meanings to others so perhaps that might clarify at least what I intended :)

Yes, but notice that the above is about interactive mode "add -i" that is setting the diff.context to 7 for subsequent "patch" command, not against "Stage this hunk [y,n,q,...]?" prompt inside "add -p". Once you go into the "--patch" mode, especially after you let the user to edit some hunks, "redisplay this hunk with wider context" is an impossible operation with the current code structure, I think, as the implementation does not keep track of information that are needed to do so.

So, this is like "restarting 'add -p' with -U7", but done from the "add -i" session.

We use "imply" to mean quite a different thing from what you said in the above explanation, and that is where my reaction came from.

We say "option A implies option B" only when the command behaves as if the user gave option B when only option A is given (and without giving B). For example, "git commit --help" has

--short::
When doing a dry-run, give the output in the short-format. See linkgit:git-status[1] for details. Implies --dry-run.

The --short option does not make any sense when you are actually creating a commit; if you say "git commit --short", the command behaves as if you said "git commit --dry-run --short".

If something works only under certain condition, it seems we tend to say "this only works when/with ...", so in this case, we would have said "The -U<n> option is only effective for --interactive or --patch mode of this command" to express what you meant to convey, I think.

Thanks.

This series of patches attempt to give --interactive/--patch compatible builtins ("add", "commit", "checkout", "reset", "restore" and "stash") better support and nicer experience for configuring how many context lines are shown in diffs through a variety of ways.

Prior to these patches, the user could not choose how many context lines they saw in --patch commands (apart from one workaround by using GIT_DIFF_OPTS=-u<number> ..., however this isn't a good user experience or a persistent solution). Additionally, the behaviour around reading from the diff.context and diff.interHunkContext configs was also inconsistent with other diff generating commands such as "log -p".

The summarised changes below hopefully make this experience better and fix some inconsistencies:

* diff.context and diff.interHunkContext configs are now respected by --patch compatible commands
* --unified and --inter-hunk-context command line options have been added to --patch compatible commands (which take prescendence over file configs)
* "add" and "commit" in --interactive mode now expose a new "context" subcommand which configures the amount of context lines you wish to see in subsequent diffs generated from other subcommands such as "patch" or "diff"

The original discussion for this can be read at:

* https://lore.kernel.org/git/CAP9jKjGb-Rcr=RLJEzeFdtrekYM+qmHy+1T1fykU3n9cV4GhGw@mail.gmail.com/

Changes since v1:

* Update commit descriptions
* Update tests to use the more modern and robust test_grep and test_config utils
* Reword some documentation / user messages
* Ensure each commit is atomic and builds/passes tests on it's own
* Make new command line options DRY
* Add tests for interhunk context interaction
* Error if context config/command line options are negative
* Drop previous last commit to do with new subcommand for --interactive add/commit. My motivations behind this patch series originally where quite simple, just for add-patch commands to respect context configs. This subcommand, after the discussion in v1, will require more thought and a larger implementation that what I had anticipated. I would prefer to leave this for another time as it's the least impactful but the most time intensive and complicated idea.

Leon Michalak (4):
test: refactor to use "test_grep"
test: refactor to use "test_config"
add-patch: respect diff.context configuration
add-patch: add diff.context command line overrides

 Documentation/diff-context-options.adoc |  10 ++
 Documentation/git-add.adoc              |   2 +
 Documentation/git-checkout.adoc         |   2 +
 Documentation/git-commit.adoc           |   2 +
 Documentation/git-reset.adoc            |   2 +
 Documentation/git-restore.adoc          |   2 +
 Documentation/git-stash.adoc            |   2 +
 add-interactive.c                       |  53 +++++++--
 add-interactive.h                       |  17 ++-
 add-patch.c                             |  11 +-
 builtin/add.c                           |  16 ++-
 builtin/checkout.c                      |  24 +++-
 builtin/commit.c                        |  11 +-
 builtin/reset.c                         |  12 +-
 builtin/stash.c                         |  46 ++++++--
 commit.h                                |   3 +-
 parse-options.h                         |   2 +
 t/t3701-add-interactive.sh              |  48 ++++----
 t/t4032-diff-inter-hunk-context.sh      |  61 ++++++++++
 t/t4055-diff-context.sh                 | 142 ++++++++++++++++++++----
 t/t9902-completion.sh                   |   2 +
 21 files changed, 390 insertions(+), 80 deletions(-)
 create mode 100644 Documentation/diff-context-options.adoc

base-commit: f65182a99e545d2f2bc22e6c1c2da192133b16a3
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1915%2FNinjaInShade%2Finteractive-patch-context-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1915/NinjaInShade/interactive-patch-context-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1915

Range-diff vs v1:

 -:  ----------- > 1:  4f92a1b4c24 test: refactor to use "test_grep"
 -:  ----------- > 2:  75424cb8e1c test: refactor to use "test_config"
 1:  8b91eef8120 ! 3:  f16d3de8611 add-patch: respect diff.context configuration
     @@ Metadata
       ## Commit message ##
          add-patch: respect diff.context configuration
      
     -    This aims to teach relevant builtins (that take in `--patch`) to respect
     +    Various builtins that use add-patch infrastructure do not respect
          the user's diff.context and diff.interHunkContext file configurations.
     -
     -    Since these are both UI options and `--patch` is designed for the end user,
     -    I believe this was previously just an inconsistency, which this patch hopes
     -    to address.
     +    This patch fixes this inconsistency.
      
          Signed-off-by: Leon Michalak <[email protected]>
      
       ## add-interactive.c ##
     -@@ add-interactive.c: void init_add_i_state(struct add_i_state *s, struct repository *r)
     +@@ add-interactive.c: 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;
     @@ add-interactive.c: void init_add_i_state(struct add_i_state *s, struct repositor
       	repo_config_get_string(r, "diff.algorithm",
       			       &s->interactive_diff_algorithm);
       
     -+	repo_config_get_int(r, "diff.context", &s->context);
     -+	repo_config_get_int(r, "diff.interHunkContext", &s->interhunkcontext);
     ++	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);
     -@@ add-interactive.c: static int run_diff(struct add_i_state *s, const struct pathspec *ps,
     - 	if (count > 0) {
     - 		struct child_process cmd = CHILD_PROCESS_INIT;
     +
     + ## add-interactive.h ##
     +@@ add-interactive.h: struct add_i_state {
     + 
     + 	int use_single_key;
     + 	char *interactive_diff_filter, *interactive_diff_algorithm;
     ++	int context, interhunkcontext;
     + };
       
     --		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached",
     --			     oid_to_hex(!is_initial ? &oid :
     --					s->r->hash_algo->empty_tree),
     --			     "--", NULL);
     -+		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached", NULL);
     -+		if (s->context != -1)
     -+			strvec_pushf(&cmd.args, "--unified=%i", s->context);
     -+		if (s->interhunkcontext != -1)
     -+			strvec_pushf(&cmd.args, "--inter-hunk-context=%i", s->interhunkcontext);
     -+		strvec_pushl(&cmd.args, oid_to_hex(!is_initial ? &oid :
     -+			     s->r->hash_algo->empty_tree), "--", NULL);
     - 		for (i = 0; i < files->items.nr; i++)
     - 			if (files->selected[i])
     - 				strvec_push(&cmd.args,
     + void init_add_i_state(struct add_i_state *s, struct repository *r);
      
       ## add-patch.c ##
      @@ add-patch.c: static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
     @@ add-patch.c: static int parse_diff(struct add_p_state *s, const struct pathspec
      
       ## t/t4055-diff-context.sh ##
      @@ t/t4055-diff-context.sh: test_expect_success 'diff.context honored by "log"' '
     - 	! grep firstline output &&
     - 	git config diff.context 8 &&
     - 	git log -1 -p >output &&
     --	grep "^ firstline" output
     -+	grep "^ firstline" output &&
     -+	git config --unset diff.context
     -+'
     -+
     + 	test_grep "^ firstline" output
     + '
     + 
      +test_expect_success 'diff.context honored by "add"' '
      +	git add -p >output &&
     -+	! grep firstline output &&
     -+	git config diff.context 8 &&
     -+	git add -p >output &&
     -+	grep "^ firstline" output &&
     -+	git config --unset diff.context
     ++	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 &&
     -+	! grep firstline output &&
     -+	git config diff.context 8 &&
     ++	test_grep ! firstline output &&
     ++	test_config diff.context 8 &&
      +	! git commit -p >output &&
     -+	grep "^ firstline" output &&
     -+	git config --unset diff.context
     ++	test_grep "^ firstline" output
      +'
      +
      +test_expect_success 'diff.context honored by "checkout"' '
      +	git checkout -p >output &&
     -+	! grep firstline output &&
     -+	git config diff.context 8 &&
     ++	test_grep ! firstline output &&
     ++	test_config diff.context 8 &&
      +	git checkout -p >output &&
     -+	grep "^ firstline" output &&
     -+	git config --unset diff.context
     ++	test_grep "^ firstline" output
      +'
      +
      +test_expect_success 'diff.context honored by "stash"' '
      +	! git stash -p >output &&
     -+	! grep firstline output &&
     -+	git config diff.context 8 &&
     ++	test_grep ! firstline output &&
     ++	test_config diff.context 8 &&
      +	! git stash -p >output &&
     -+	grep "^ firstline" output &&
     -+	git config --unset diff.context
     ++	test_grep "^ firstline" output
      +'
      +
      +test_expect_success 'diff.context honored by "restore"' '
      +	git restore -p >output &&
     -+	! grep firstline output &&
     -+	git config diff.context 8 &&
     ++	test_grep ! firstline output &&
     ++	test_config diff.context 8 &&
      +	git restore -p >output &&
     -+	grep "^ firstline" output &&
     -+	git config --unset diff.context
     ++	test_grep "^ firstline" output
     ++'
     ++
     + test_expect_success 'The -U option overrides diff.context' '
     + 	test_config diff.context 8 &&
     + 	git log -U4 -1 >output &&
     +@@ t/t4055-diff-context.sh: test_expect_success 'negative integer config parsing' '
     + 	test_grep "bad config variable" output
       '
       
     - test_expect_success 'The -U option overrides diff.context' '
     ++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 &&
 2:  7700eb173e7 ! 4:  973dfadd1b3 add-patch: add diff.context command line overrides
     @@ Metadata
       ## Commit message ##
          add-patch: add diff.context command line overrides
      
     -    This patch compliments `8b91eef812`, where builtins that accept
     -    `--patch` options now respect `diff.context` and `diff.interHunkContext`
     -    file configurations.
     +    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 `diff` which allows for both context file configuration and
     -    command line overrides.
     +    This mimics commands such as diff and log, which allow for both context
     +    file configuration and command line overrides.
      
          Signed-off-by: Leon Michalak <[email protected]>
      
     - ## Documentation/git-add.adoc ##
     -@@ Documentation/git-add.adoc: This effectively runs `add --interactive`, but bypasses the
     - initial command menu and directly jumps to the `patch` subcommand.
     - See ``Interactive mode'' for details.
     - 
     + ## Documentation/diff-context-options.adoc (new) ##
     +@@
      +`-U<n>`::
      +`--unified=<n>`::
      +	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
     -+	or 3 if the config option is unset. Implies `--interactive/--patch`.
     ++	or 3 if the config option is unset.
      +
      +`--inter-hunk-context=<n>`::
      +	Show the context between diff hunks, up to the specified _<number>_
      +	of lines, thereby fusing hunks that are close to each other.
      +	Defaults to `diff.interHunkContext` or 0 if the config option
     -+	is unset. Implies `--interactive/--patch`.
     ++	is unset.
     +
     + ## Documentation/git-add.adoc ##
     +@@ Documentation/git-add.adoc: This effectively runs `add --interactive`, but bypasses the
     + initial command menu and directly jumps to the `patch` subcommand.
     + See ``Interactive mode'' for details.
     + 
     ++include::diff-context-options.adoc[]
      +
       `-e`::
       `--edit`::
     @@ Documentation/git-checkout.adoc: section of linkgit:git-add[1] to learn how to o
       Note that this option uses the no overlay mode by default (see also
       `--overlay`), and currently doesn't support overlay mode.
       
     -+`-U<n>`::
     -+`--unified=<n>`::
     -+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
     -+	or 3 if the config option is unset. Implies `--patch`.
     -+
     -+`--inter-hunk-context=<n>`::
     -+	Show the context between diff hunks, up to the specified _<number>_
     -+	of lines, thereby fusing hunks that are close to each other.
     -+	Defaults to `diff.interHunkContext` or 0 if the config option
     -+	is unset. Implies `--patch`.
     ++include::diff-context-options.adoc[]
      +
       --ignore-other-worktrees::
       	`git checkout` refuses when the wanted branch is already checked
     @@ Documentation/git-commit.adoc: OPTIONS
       	which changes to commit. See linkgit:git-add[1] for
       	details.
       
     -+`-U<n>`::
     -+`--unified=<n>`::
     -+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
     -+	or 3 if the config option is unset. Implies `--interactive/--patch`.
     -+
     -+`--inter-hunk-context=<n>`::
     -+	Show the context between diff hunks, up to the specified _<number>_
     -+	of lines, thereby fusing hunks that are close to each other.
     -+	Defaults to `diff.interHunkContext` or 0 if the config option
     -+	is unset. Implies `--interactive/--patch`.
     ++include::diff-context-options.adoc[]
      +
       `-C <commit>`::
       `--reuse-message=<commit>`::
     @@ Documentation/git-reset.adoc: OPTIONS
       	separated with _NUL_ character and all other characters are taken
       	literally (including newlines and quotes).
       
     -+`-U<n>`::
     -+`--unified=<n>`::
     -+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
     -+	or 3 if the config option is unset. Implies `--patch`.
     -+
     -+`--inter-hunk-context=<n>`::
     -+	Show the context between diff hunks, up to the specified _<number>_
     -+	of lines, thereby fusing hunks that are close to each other.
     -+	Defaults to `diff.interHunkContext` or 0 if the config option
     -+	is unset. Implies `--patch`.
     ++include::diff-context-options.adoc[]
      +
       `--`::
       	Do not interpret any more arguments as options.
     @@ Documentation/git-restore.adoc: leave out at most one of _<rev-A>__ and _<rev-B>
       	Mode" section of linkgit:git-add[1] to learn how to operate
       	the `--patch` mode.
       
     -+`-U<n>`::
     -+`--unified=<n>`::
     -+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
     -+	or 3 if the config option is unset. Implies `--patch`.
     -+
     -+`--inter-hunk-context=<n>`::
     -+	Show the context between diff hunks, up to the specified _<number>_
     -+	of lines, thereby fusing hunks that are close to each other.
     -+	Defaults to `diff.interHunkContext` or 0 if the config option
     -+	is unset. Implies `--patch`.
     ++include::diff-context-options.adoc[]
      +
       `-W`::
       `--worktree`::
     @@ Documentation/git-stash.adoc: to learn how to operate the `--patch` mode.
       The `--patch` option implies `--keep-index`.  You can use
       `--no-keep-index` to override this.
       
     -+`-U<n>`::
     -+`--unified=<n>`::
     -+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
     -+	or 3 if the config option is unset. Implies `--patch`.
     -+
     -+`--inter-hunk-context=<n>`::
     -+	Show the context between diff hunks, up to the specified _<number>_
     -+	of lines, thereby fusing hunks that are close to each other.
     -+	Defaults to `diff.interHunkContext` or 0 if the config option
     -+	is unset. Implies `--patch`.
     ++include::diff-context-options.adoc[]
      +
       -S::
       --staged::
     @@ add-interactive.c: static void init_color(struct repository *r, struct add_i_sta
      +		      struct add_p_opt *add_p_opt)
       {
       	const char *value;
     - 
     + 	int context;
      @@ add-interactive.c: void init_add_i_state(struct add_i_state *s, struct repository *r)
       	repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);
       	if (s->use_single_key)
       		setbuf(stdin, NULL);
      +
     -+	if (add_p_opt->context != -1)
     ++	if (add_p_opt->context != -1) {
     ++		if (add_p_opt->context < 0)
     ++			die(_("%s cannot be negative"), "--unified");
      +		s->context = add_p_opt->context;
     -+	if (add_p_opt->interhunkcontext != -1)
     ++	}
     ++	if (add_p_opt->interhunkcontext != -1) {
     ++		if (add_p_opt->interhunkcontext < 0)
     ++			die(_("%s cannot be negative"), "--inter-hunk-context");
      +		s->interhunkcontext = add_p_opt->interhunkcontext;
     ++	}
       }
       
       void clear_add_i_state(struct add_i_state *s)
     @@ add-interactive.c: static int run_patch(struct add_i_state *s, const struct path
       		strvec_clear(&args);
       		clear_pathspec(&ps_selected);
       	}
     +@@ add-interactive.c: static int run_diff(struct add_i_state *s, const struct pathspec *ps,
     + 	if (count > 0) {
     + 		struct child_process cmd = CHILD_PROCESS_INIT;
     + 
     +-		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached",
     +-			     oid_to_hex(!is_initial ? &oid :
     +-					s->r->hash_algo->empty_tree),
     +-			     "--", NULL);
     ++		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached", NULL);
     ++		if (s->context != -1)
     ++			strvec_pushf(&cmd.args, "--unified=%i", s->context);
     ++		if (s->interhunkcontext != -1)
     ++			strvec_pushf(&cmd.args, "--inter-hunk-context=%i", s->interhunkcontext);
     ++		strvec_pushl(&cmd.args, oid_to_hex(!is_initial ? &oid :
     ++			     s->r->hash_algo->empty_tree), "--", NULL);
     + 		for (i = 0; i < files->items.nr; i++)
     + 			if (files->selected[i])
     + 				strvec_push(&cmd.args,
      @@ add-interactive.c: static void command_prompt_help(struct add_i_state *s)
       			 _("(empty) select nothing"));
       }
     @@ add-interactive.h
       
       #include "color.h"
       
     -+#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1 }
     -+
      +struct add_p_opt {
      +	int context;
      +	int interhunkcontext;
      +};
     ++
     ++#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1 }
      +
       struct add_i_state {
       	struct repository *r;
       	int use_color;
      @@ add-interactive.h: struct add_i_state {
     - 
     - 	int use_single_key;
     - 	char *interactive_diff_filter, *interactive_diff_algorithm;
     -+	int context, interhunkcontext;
     + 	int context, interhunkcontext;
       };
       
      -void init_add_i_state(struct add_i_state *s, struct repository *r);
     @@ builtin/add.c: int interactive_add(struct repository *repo,
       
       	if (patch)
      -		ret = !!run_add_p(repo, ADD_P_ADD, NULL, &pathspec);
     -+		ret = !!run_add_p(repo, ADD_P_ADD, add_p_opt, NULL,
     -+				  &pathspec);
     ++		ret = !!run_add_p(repo, ADD_P_ADD, add_p_opt, NULL, &pathspec);
       	else
      -		ret = !!run_add_i(repo, &pathspec);
      +		ret = !!run_add_i(repo, &pathspec, add_p_opt);
     @@ builtin/add.c: static struct option builtin_add_options[] = {
       	OPT_GROUP(""),
       	OPT_BOOL('i', "interactive", &add_interactive, N_("interactive picking")),
       	OPT_BOOL('p', "patch", &patch_interactive, N_("select hunks interactively")),
     -+	OPT_INTEGER_F('U', "unified", &add_p_opt.context,
     -+		      N_("generate diffs with <n> lines context, implies --interactive/--patch"),
     -+		      PARSE_OPT_NONEG),
     -+	OPT_INTEGER_F(0, "inter-hunk-context", &add_p_opt.interhunkcontext,
     -+		      N_("show context between diff hunks up to the specified number of lines, implies --interactive/--patch"),
     -+		      PARSE_OPT_NONEG),
     ++	OPT_DIFF_UNIFIED(&add_p_opt.context),
     ++	OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
       	OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")),
       	OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files"), 0),
       	OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")),
     @@ builtin/checkout.c: static struct option *add_checkout_path_options(struct check
       			      N_("checkout their version for unmerged files"),
       			      3, PARSE_OPT_NONEG),
       		OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")),
     -+		OPT_INTEGER_F('U', "unified", &opts->patch_context,
     -+			N_("generate diffs with <n> lines context, implies --patch"),
     -+			PARSE_OPT_NONEG),
     -+		OPT_INTEGER_F(0, "inter-hunk-context", &opts->patch_interhunk_context,
     -+			N_("show context between diff hunks up to the specified number of lines, implies --patch"),
     -+			PARSE_OPT_NONEG),
     ++		OPT_DIFF_UNIFIED(&opts->patch_context),
     ++		OPT_DIFF_INTERHUNK_CONTEXT(&opts->patch_interhunk_context),
       		OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree,
       			 N_("do not limit pathspecs to sparse entries only")),
       		OPT_PATHSPEC_FROM_FILE(&opts->pathspec_from_file),
     @@ builtin/commit.c: int cmd_commit(int argc,
       		OPT_BOOL('i', "include", &also, N_("add specified files to index for commit")),
       		OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
       		OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
     -+		OPT_INTEGER_F('U', "unified", &add_p_opt.context,
     -+			      N_("generate diffs with <n> lines context, implies --interactive/--patch"),
     -+			      PARSE_OPT_NONEG),
     -+		OPT_INTEGER_F(0, "inter-hunk-context", &add_p_opt.interhunkcontext,
     -+			      N_("show context between diff hunks up to the specified number of lines, implies --interactive/--patch"),
     -+			      PARSE_OPT_NONEG),
     ++		OPT_DIFF_UNIFIED(&add_p_opt.context),
     ++		OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
       		OPT_BOOL('o', "only", &only, N_("commit only specified files")),
       		OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
       		OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),
     @@ builtin/reset.c: int cmd_reset(int argc,
       			       PARSE_OPT_OPTARG,
       			       option_parse_recurse_submodules_worktree_updater),
       		OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
     -+		OPT_INTEGER_F('U', "unified", &add_p_opt.context,
     -+			       N_("generate diffs with <n> lines context, implies --patch"),
     -+			       PARSE_OPT_NONEG),
     -+		OPT_INTEGER_F(0, "inter-hunk-context", &add_p_opt.interhunkcontext,
     -+			       N_("show context between diff hunks up to the specified number of lines, implies --patch"),
     -+			       PARSE_OPT_NONEG),
     ++		OPT_DIFF_UNIFIED(&add_p_opt.context),
     ++		OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
       		OPT_BOOL('N', "intent-to-add", &intent_to_add,
       				N_("record only the fact that removed paths will be added later")),
       		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
     @@ builtin/stash.c: static int push_stash(int argc, const char **argv, const char *
       			 N_("stash staged changes only")),
       		OPT_BOOL('p', "patch", &patch_mode,
       			 N_("stash in patch mode")),
     -+		OPT_INTEGER_F('U', "unified", &add_p_opt.context,
     -+			      N_("generate diffs with <n> lines context, implies --patch"),
     -+			      PARSE_OPT_NONEG),
     -+		OPT_INTEGER_F(0, "inter-hunk-context", &add_p_opt.interhunkcontext,
     -+			      N_("show context between diff hunks up to the specified number of lines, implies --patch"),
     -+			      PARSE_OPT_NONEG),
     ++		OPT_DIFF_UNIFIED(&add_p_opt.context),
     ++		OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
       		OPT__QUIET(&quiet, N_("quiet mode")),
       		OPT_BOOL('u', "include-untracked", &include_untracked,
       			 N_("include untracked files in stash")),
     @@ builtin/stash.c: static int save_stash(int argc, const char **argv, const char *
       			 N_("stash staged changes only")),
       		OPT_BOOL('p', "patch", &patch_mode,
       			 N_("stash in patch mode")),
     -+		OPT_INTEGER_F('U', "unified", &add_p_opt.context,
     -+			      N_("generate diffs with <n> lines context, implies --patch"),
     -+			      PARSE_OPT_NONEG),
     -+		OPT_INTEGER_F(0, "inter-hunk-context", &add_p_opt.interhunkcontext,
     -+			      N_("show context between diff hunks up to the specified number of lines, implies --patch"),
     -+			      PARSE_OPT_NONEG),
     ++		OPT_DIFF_UNIFIED(&add_p_opt.context),
     ++		OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
       		OPT__QUIET(&quiet, N_("quiet mode")),
       		OPT_BOOL('u', "include-untracked", &include_untracked,
       			 N_("include untracked files in stash")),
     @@ commit.h: int for_each_commit_graft(each_commit_graft_fn, void *);
       struct commit_extra_header {
       	struct commit_extra_header *next;
      
     + ## parse-options.h ##
     +@@ parse-options.h: int parse_opt_tracking_mode(const struct option *, const char *, int);
     + #define OPT_PATHSPEC_FROM_FILE(v) OPT_FILENAME(0, "pathspec-from-file", v, N_("read pathspec from file"))
     + #define OPT_PATHSPEC_FILE_NUL(v)  OPT_BOOL(0, "pathspec-file-nul", v, N_("with --pathspec-from-file, pathspec elements are separated with NUL character"))
     + #define OPT_AUTOSTASH(v) OPT_BOOL(0, "autostash", v, N_("automatically stash/stash pop before and after"))
     ++#define OPT_DIFF_UNIFIED(v) OPT_INTEGER_F('U', "unified", v, N_("generate diffs with <n> lines context"), PARSE_OPT_NONEG)
     ++#define OPT_DIFF_INTERHUNK_CONTEXT(v) OPT_INTEGER_F(0, "inter-hunk-context", v, N_("show context between diff hunks up to the specified number of lines"), PARSE_OPT_NONEG)
     + 
     + #define OPT_IPVERSION(v) \
     + 	OPT_SET_INT_F('4', "ipv4", (v), N_("use IPv4 addresses only"), \
     +
     + ## t/t4032-diff-inter-hunk-context.sh ##
     +@@ t/t4032-diff-inter-hunk-context.sh: t() {
     + 	"
     + }
     + 
     ++t_patch() {
     ++	use_config=
     ++	git config --unset diff.interHunkContext
     ++
     ++	case $# in
     ++	4) hunks=$4; cmd="add -p -U$3";;
     ++	5) hunks=$5; cmd="add -p -U$3 --inter-hunk-context=$4";;
     ++	6) hunks=$5; cmd="add -p -U$3"; git config diff.interHunkContext $4; use_config="(diff.interHunkContext=$4) ";;
     ++	esac
     ++	label="$use_config$cmd, $1 common $2"
     ++	file=f$1
     ++
     ++	if ! test -f $file
     ++	then
     ++		f A $1 B >$file
     ++		git add $file
     ++		git commit -q -m. $file
     ++		f X $1 Y >$file
     ++	fi
     ++
     ++	test_expect_success "$label: count hunks ($hunks)" "
     ++		test $(test_write_lines q | git $cmd $file | sed -n 's/^([0-9]*\/\([0-9]*\)) Stage this hunk.*/\1/p') = $hunks
     ++	"
     ++}
     ++
     + cat <<EOF >expected.f1.0.1 || exit 1
     + diff --git a/f1 b/f1
     + --- a/f1
     +@@ t/t4032-diff-inter-hunk-context.sh: t 3 lines	1	2	1	config
     + t 9 lines	3	2	2	config
     + t 9 lines	3	3	1	config
     + 
     ++# common lines	ctx	intrctx	hunks
     ++t_patch 1 line	0		2
     ++t_patch 1 line	0	0	2
     ++t_patch 1 line	0	1	1
     ++t_patch 1 line	0	2	1
     ++t_patch 1 line	1		1
     ++
     ++t_patch 2 lines	0		2
     ++t_patch 2 lines	0	0	2
     ++t_patch 2 lines	0	1	2
     ++t_patch 2 lines	0	2	1
     ++t_patch 2 lines	1		1
     ++
     ++t_patch 3 lines	1		2
     ++t_patch 3 lines	1	0	2
     ++t_patch 3 lines	1	1	1
     ++t_patch 3 lines	1	2	1
     ++
     ++t_patch 9 lines	3		2
     ++t_patch 9 lines	3	2	2
     ++t_patch 9 lines	3	3	1
     ++
     ++#					use diff.interHunkContext?
     ++t_patch 1 line	0	0	2	config
     ++t_patch 1 line	0	1	1	config
     ++t_patch 1 line	0	2	1	config
     ++t_patch 9 lines	3	3	1	config
     ++t_patch 2 lines	0	0	2	config
     ++t_patch 2 lines	0	1	2	config
     ++t_patch 2 lines	0	2	1	config
     ++t_patch 3 lines	1	0	2	config
     ++t_patch 3 lines	1	1	1	config
     ++t_patch 3 lines	1	2	1	config
     ++t_patch 9 lines	3	2	2	config
     ++t_patch 9 lines	3	3	1	config
     ++
     + test_expect_success 'diff.interHunkContext invalid' '
     + 	git config diff.interHunkContext asdf &&
     + 	test_must_fail git diff &&
     +
       ## t/t4055-diff-context.sh ##
      @@ t/t4055-diff-context.sh: test_expect_success 'The -U option overrides diff.context' '
     - 	! grep "^ firstline" output
     + 	test_grep ! "^ firstline" output
       '
       
      +test_expect_success 'The -U option overrides diff.context for "add"' '
     -+	git config diff.context 8 &&
     ++	test_config diff.context 8 &&
      +	git add -U4 -p >output &&
     -+	! grep "^ firstline" output
     ++	test_grep ! "^ firstline" output
      +'
      +
      +test_expect_success 'The -U option overrides diff.context for "commit"' '
     -+	git config diff.context 8 &&
     ++	test_config diff.context 8 &&
      +	! git commit -U4 -p >output &&
     -+	! grep "^ firstline" output
     ++	test_grep ! "^ firstline" output
      +'
      +
      +test_expect_success 'The -U option overrides diff.context for "checkout"' '
     -+	git config diff.context 8 &&
     ++	test_config diff.context 8 &&
      +	git checkout -U4 -p >output &&
     -+	! grep "^ firstline" output
     ++	test_grep ! "^ firstline" output
      +'
      +
      +test_expect_success 'The -U option overrides diff.context for "stash"' '
     -+	git config diff.context 8 &&
     ++	test_config diff.context 8 &&
      +	! git stash -U4 -p >output &&
     -+	! grep "^ firstline" output
     ++	test_grep ! "^ firstline" output
      +'
      +
      +test_expect_success 'The -U option overrides diff.context for "restore"' '
     -+	git config diff.context 8 &&
     ++	test_config diff.context 8 &&
      +	git restore -U4 -p >output &&
     -+	! grep "^ firstline" output
     ++	test_grep ! "^ firstline" output
      +'
      +
       test_expect_success 'diff.context honored by "diff"' '
     - 	git config diff.context 8 &&
     + 	test_config diff.context 8 &&
       	git diff >output &&
      
       ## t/t9902-completion.sh ##

3: b4b7854f330 < -: ----------- add-interactive: add new "context" subcommand

gitgitgadget

From: Leon Michalak <[email protected]>

Refactor to use the modern "test_grep" test utility instead of regular "grep" which provides better debug information if tests fail.

This is a prerequisite to the commits that follow which add to both test files.

---
 t/t3701-add-interactive.sh | 48 +++++++++++++++++++-------------------
 t/t4055-diff-context.sh    | 28 +++++++++++-----------
 2 files changed, 38 insertions(+), 38 deletions(-)

index b8a05d95f3f1..b088ee141ff4 100755
@@ -63,7 +63,7 @@ test_expect_success 'setup (initial)' '
 '
 test_expect_success 'status works (initial)' '
 	git add -i </dev/null >output &&
-	grep "+1/-0 *+2/-0 file" output
+	test_grep "+1/-0 *+2/-0 file" output
 '
 
 test_expect_success 'setup expected' '

@@ -86,7 +86,7 @@ test_expect_success 'revert works (initial)' '
 	git add file &&
 	test_write_lines r 1 | git add -i &&
 	git ls-files >output &&
-	! grep . output
+	test_grep ! . output
 '
 
 test_expect_success 'add untracked (multiple)' '

@@ -109,7 +109,7 @@ test_expect_success 'setup (commit)' '
 '
 test_expect_success 'status works (commit)' '
 	git add -i </dev/null >output &&
-	grep "+1/-0 *+2/-0 file" output
+	test_grep "+1/-0 *+2/-0 file" output
 '
 
 test_expect_success 'update can stage deletions' '

@@ -141,7 +141,7 @@ test_expect_success 'revert works (commit)' '
 	git add file &&
 	test_write_lines r 1 | git add -i &&
 	git add -i </dev/null >output &&
-	grep "unchanged *+3/-0 file" output
+	test_grep "unchanged *+3/-0 file" output
 '
 
 test_expect_success 'reject multi-key input' '

@@ -185,7 +185,7 @@ test_expect_success 'setup fake editor' '
 test_expect_success 'bad edit rejected' '
 	git reset &&
 	test_write_lines e n d | git add -p >output &&
-	grep "hunk does not apply" output
+	test_grep "hunk does not apply" output
 '
 
 test_expect_success 'setup patch' '

@@ -198,7 +198,7 @@ test_expect_success 'setup patch' '
 test_expect_success 'garbage edit rejected' '
 	git reset &&
 	test_write_lines e n d | git add -p >output &&
-	grep "hunk does not apply" output
+	test_grep "hunk does not apply" output
 '
 
 test_expect_success 'setup patch' '

@@ -313,8 +313,8 @@ test_expect_success FILEMODE 'stage mode and hunk' '
 	chmod +x file &&
 	printf "y\\ny\\n" | git add -p &&
 	git diff --cached file >out &&
-	grep "new mode" out &&
-	grep "+content" out &&
+	test_grep "new mode" out &&
+	test_grep "+content" out &&
 	git diff file >out &&
 	test_must_be_empty out
 '

@@ -636,7 +636,7 @@ test_expect_success 'split hunk "add -p (edit)"' '
 	printf "%s\n" s e     q n q q |
 	EDITOR=: git add -p &&
 	git diff >actual &&
-	! grep "^+15" actual
+	test_grep ! "^+15" actual
 '
 
 test_expect_success 'split hunk "add -p (no, yes, edit)"' '

@@ -648,7 +648,7 @@ test_expect_success 'split hunk "add -p (no, yes, edit)"' '
 	EDITOR=: git add -p 2>error &&
 	test_must_be_empty error &&
 	git diff >actual &&
-	! grep "^+31" actual
+	test_grep ! "^+31" actual
 '
 
 test_expect_success 'split hunk with incomplete line at end' '

@@ -682,7 +682,7 @@ test_expect_success 'edit, adding lines to the first hunk' '
 	EDITOR=./fake_editor.sh git add -p 2>error &&
 	test_must_be_empty error &&
 	git diff --cached >actual &&
-	grep "^+22" actual
+	test_grep "^+22" actual
 '
 
 test_expect_success 'patch mode ignores unmerged entries' '

@@ -696,7 +696,7 @@ test_expect_success 'patch mode ignores unmerged entries' '
 	test_must_fail git merge side &&
 	echo changed >non-conflict.t &&
 	echo y | git add -p >output &&
-	! grep a/conflict.t output &&
+	test_grep ! a/conflict.t output &&
 	cat >expected <<-\EOF &&
 	* Unmerged path conflict.t
 	diff --git a/non-conflict.t b/non-conflict.t

@@ -728,7 +728,7 @@ test_expect_success 'diffs can be colorized' '
 
 	# We do not want to depend on the exact coloring scheme
 	# git uses for diffs, so just check that we saw some kind of color.
-	grep "$(printf "\\033")" output
+	test_grep "$(printf "\\033")" output
 '
 
 test_expect_success 'colors can be overridden' '

@@ -743,7 +743,7 @@ test_expect_success 'colors can be overridden' '
 		-c color.interactive.error=blue \
 		add -i 2>err.raw <input &&
 	test_decode_color <err.raw >err &&
-	grep "<BLUE>Huh (trigger)?<RESET>" err &&
+	test_grep "<BLUE>Huh (trigger)?<RESET>" err &&
 
 	test_write_lines help quit >input &&
 	force_color git \

@@ -863,7 +863,7 @@ test_expect_success 'colorized diffs respect diff.wsErrorHighlight' '
 	printf y >y &&
 	force_color git -c diff.wsErrorHighlight=all add -p >output.raw 2>&1 <y &&
 	test_decode_color <output.raw >output &&
-	grep "old<" output
+	test_grep "old<" output
 '
 
 test_expect_success 'diffFilter filters diff' '

@@ -876,7 +876,7 @@ test_expect_success 'diffFilter filters diff' '
 
 	# avoid depending on the exact coloring or content of the prompts,
 	# and just make sure we saw our diff prefixed
-	grep foo:.*content output
+	test_grep foo:.*content output
 '
 
 test_expect_success 'detect bogus diffFilter output' '

@@ -886,7 +886,7 @@ test_expect_success 'detect bogus diffFilter output' '
 	test_config interactive.diffFilter "sed 6d" &&
 	printf y >y &&
 	force_color test_must_fail git add -p <y >output 2>&1 &&
-	grep "mismatched output" output
+	test_grep "mismatched output" output
 '
 
 test_expect_success 'handle iffy colored hunk headers' '

@@ -896,7 +896,7 @@ test_expect_success 'handle iffy colored hunk headers' '
 	printf n >n &&
 	force_color git -c interactive.diffFilter="sed s/.*@@.*/XX/" \
 		add -p >output 2>&1 <n &&
-	grep "^XX$" output
+	test_grep "^XX$" output
 '
 
 test_expect_success 'handle very large filtered diff' '

@@ -1002,7 +1002,7 @@ test_expect_success 'add -p does not expand argument lists' '
 	# update it, but we want to be sure that our "." pathspec
 	# was not expanded into the argument list of any command.
 	# So look only for "not-changed".
-	! grep -E "^trace: (built-in|exec|run_command): .*not-changed" trace.out
+	test_grep ! -E "^trace: (built-in|exec|run_command): .*not-changed" trace.out
 '
 
 test_expect_success 'hunk-editing handles custom comment char' '

@@ -1072,21 +1072,21 @@ test_expect_success 'setup different kinds of dirty submodules' '
 
 test_expect_success 'status ignores dirty submodules (except HEAD)' '
 	git -C for-submodules add -i </dev/null >output &&
-	grep dirty-head output &&
-	grep dirty-both-ways output &&
-	! grep dirty-otherwise output
+	test_grep dirty-head output &&
+	test_grep dirty-both-ways output &&
+	test_grep ! dirty-otherwise output
 '
 
 test_expect_success 'handle submodules' '
 	echo 123 >>for-submodules/dirty-otherwise/initial.t &&
 
 	force_color git -C for-submodules add -p dirty-otherwise >output 2>&1 &&
-	grep "No changes" output &&
+	test_grep "No changes" output &&
 
 	force_color git -C for-submodules add -p dirty-head >output 2>&1 <y &&
 	git -C for-submodules ls-files --stage dirty-head >actual &&
 	rev="$(git -C for-submodules/dirty-head rev-parse HEAD)" &&
-	grep "$rev" actual
+	test_grep "$rev" actual
 '
 
 test_expect_success 'set up pathological context' '

index ec2804eea67c..c66f966a3ab3 100755
@@ -38,36 +38,36 @@ test_expect_success 'setup' '
 
 test_expect_success 'the default number of context lines is 3' '
 	git diff >output &&
-	! grep "^ d" output &&
-	grep "^ e" output &&
-	grep "^ j" output &&
-	! grep "^ k" output
+	test_grep ! "^ d" output &&
+	test_grep "^ e" output &&
+	test_grep "^ j" output &&
+	test_grep ! "^ k" output
 '
 
 test_expect_success 'diff.context honored by "log"' '
 	git log -1 -p >output &&
-	! grep firstline output &&
+	test_grep ! firstline output &&
 	git config diff.context 8 &&
 	git log -1 -p >output &&
-	grep "^ firstline" output
+	test_grep "^ firstline" output
 '
 
 test_expect_success 'The -U option overrides diff.context' '
 	git config diff.context 8 &&
 	git log -U4 -1 >output &&
-	! grep "^ firstline" output
+	test_grep ! "^ firstline" output
 '
 
 test_expect_success 'diff.context honored by "diff"' '
 	git config diff.context 8 &&
 	git diff >output &&
-	grep "^ firstline" output
+	test_grep "^ firstline" output
 '
 
 test_expect_success 'plumbing not affected' '
 	git config diff.context 8 &&
 	git diff-files -p >output &&
-	! grep "^ firstline" output
+	test_grep ! "^ firstline" output
 '
 
 test_expect_success 'non-integer config parsing' '

@@ -85,8 +85,8 @@ test_expect_success 'negative integer config parsing' '
 test_expect_success '-U0 is valid, so is diff.context=0' '
 	git config diff.context 0 &&
 	git diff >output &&
-	grep "^-ADDED" output &&
-	grep "^+MODIFIED" output
+	test_grep "^-ADDED" output &&
+	test_grep "^+MODIFIED" output
 '
 
 test_expect_success '-U2147483647 works' '

@@ -94,9 +94,9 @@ test_expect_success '-U2147483647 works' '
 	test_line_count = 16 x &&
 	git diff -U2147483647 >output &&
 	test_line_count = 22 output &&
-	grep "^-ADDED" output &&
-	grep "^+MODIFIED" output &&
-	grep "^+APPENDED" output
+	test_grep "^-ADDED" output &&
+	test_grep "^+MODIFIED" output &&
+	test_grep "^+APPENDED" output
 '
 
 test_done

gitgitgadget

From: Leon Michalak <[email protected]>

Refactor to use the modern "test_config" test utility instead of manual "git config" as the former provides clean up on test completion.

This is a prerequisite to the commits that follow which add to this test file.

---
 t/t4055-diff-context.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

index c66f966a3ab3..1384a8195705 100755
@@ -47,43 +47,43 @@ test_expect_success 'the default number of context lines is 3' '
 test_expect_success 'diff.context honored by "log"' '
 	git log -1 -p >output &&
 	test_grep ! firstline output &&
-	git config diff.context 8 &&
+	test_config diff.context 8 &&
 	git log -1 -p >output &&
 	test_grep "^ firstline" output
 '
 
 test_expect_success 'The -U option overrides diff.context' '
-	git config diff.context 8 &&
+	test_config diff.context 8 &&
 	git log -U4 -1 >output &&
 	test_grep ! "^ firstline" output
 '
 
 test_expect_success 'diff.context honored by "diff"' '
-	git config diff.context 8 &&
+	test_config diff.context 8 &&
 	git diff >output &&
 	test_grep "^ firstline" output
 '
 
 test_expect_success 'plumbing not affected' '
-	git config diff.context 8 &&
+	test_config diff.context 8 &&
 	git diff-files -p >output &&
 	test_grep ! "^ firstline" output
 '
 
 test_expect_success 'non-integer config parsing' '
-	git config diff.context no &&
+	test_config diff.context no &&
 	test_must_fail git diff 2>output &&
 	test_grep "bad numeric config value" output
 '
 
 test_expect_success 'negative integer config parsing' '
-	git config diff.context -1 &&
+	test_config diff.context -1 &&
 	test_must_fail git diff 2>output &&
 	test_grep "bad config variable" output
 '
 
 test_expect_success '-U0 is valid, so is diff.context=0' '
-	git config diff.context 0 &&
+	test_config diff.context 0 &&
 	git diff >output &&
 	test_grep "^-ADDED" output &&
 	test_grep "^+MODIFIED" output

gitgitgadget

From: Leon Michalak <[email protected]>

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.

---
 add-interactive.c       | 17 ++++++++++
 add-interactive.h       |  1 +
 add-patch.c             |  6 ++++
 t/t4055-diff-context.sh | 70 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 94 insertions(+)

index 97ff35b6f12a..cac036441caf 100644
@@ -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);

index 693f125e8e4b..c63f35b14be8 100644
@@ -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);

index 95c67d8c80c4..b43ca1600738 100644
@@ -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) {

gitgitgadget

From: Leon Michalak <[email protected]>

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.

---
 Documentation/diff-context-options.adoc | 10 ++++
 Documentation/git-add.adoc              |  2 +
 Documentation/git-checkout.adoc         |  2 +
 Documentation/git-commit.adoc           |  2 +
 Documentation/git-reset.adoc            |  2 +
 Documentation/git-restore.adoc          |  2 +
 Documentation/git-stash.adoc            |  2 +
 add-interactive.c                       | 36 +++++++++++----
 add-interactive.h                       | 16 +++++--
 add-patch.c                             |  5 +-
 builtin/add.c                           | 16 +++++--
 builtin/checkout.c                      | 24 ++++++++--
 builtin/commit.c                        | 11 ++++-
 builtin/reset.c                         | 12 ++++-
 builtin/stash.c                         | 46 ++++++++++++++-----
 commit.h                                |  3 +-
 parse-options.h                         |  2 +
 t/t4032-diff-inter-hunk-context.sh      | 61 +++++++++++++++++++++++++
 t/t4055-diff-context.sh                 | 30 ++++++++++++
 t/t9902-completion.sh                   |  2 +
 20 files changed, 251 insertions(+), 35 deletions(-)
 create mode 100644 Documentation/diff-context-options.adoc

new file mode 100644
index 000000000000..e161260358ff
@@ -0,0 +1,10 @@
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset.

index eba0b419ce50..b7a735824d6c 100644
@@ -104,6 +104,8 @@ This effectively runs `add --interactive`, but bypasses the
 initial command menu and directly jumps to the `patch` subcommand.
 See ``Interactive mode'' for details.
 
+include::diff-context-options.adoc[]
+
 `-e`::
 `--edit`::
 	Open the diff vs. the index in an editor and let the user

index a66c53a5cd1e..896372fd7a29 100644
@@ -289,6 +289,8 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
 Note that this option uses the no overlay mode by default (see also
 `--overlay`), and currently doesn't support overlay mode.
 
+include::diff-context-options.adoc[]
+
 --ignore-other-worktrees::
 	`git checkout` refuses when the wanted branch is already checked
 	out or otherwise in use by another worktree. This option makes

index dc219025f1eb..ae988a883b5b 100644
@@ -76,6 +76,8 @@ OPTIONS
 	which changes to commit. See linkgit:git-add[1] for
 	details.
 
+include::diff-context-options.adoc[]
+
 `-C <commit>`::
 `--reuse-message=<commit>`::
 	Take an existing _<commit>_ object, and reuse the log message

index 53ab88c5451c..50e8a0ba6f66 100644
@@ -125,6 +125,8 @@ OPTIONS
 	separated with _NUL_ character and all other characters are taken
 	literally (including newlines and quotes).
 
+include::diff-context-options.adoc[]
+
 `--`::
 	Do not interpret any more arguments as options.
 

index 877b7772e667..1dcc2bb7aea3 100644
@@ -52,6 +52,8 @@ leave out at most one of _<rev-A>__ and _<rev-B>_, in which case it defaults to
 	Mode" section of linkgit:git-add[1] to learn how to operate
 	the `--patch` mode.
 
+include::diff-context-options.adoc[]
+
 `-W`::
 `--worktree`::
 `-S`::

index 1a5177f4986c..0578c619c410 100644
@@ -208,6 +208,8 @@ to learn how to operate the `--patch` mode.
 The `--patch` option implies `--keep-index`.  You can use
 `--no-keep-index` to override this.
 
+include::diff-context-options.adoc[]
+
 -S::
 --staged::
 	This option is only valid for `push` and `save` commands.

index cac036441caf..496a44cfe4b6 100644
@@ -36,7 +36,8 @@ static void init_color(struct repository *r, struct add_i_state *s,
 	free(key);
 }
 
-void init_add_i_state(struct add_i_state *s, struct repository *r)
+void init_add_i_state(struct add_i_state *s, struct repository *r,
+		      struct add_p_opt *add_p_opt)
 {
 	const char *value;
 	int context;

@@ -98,6 +99,17 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
 	repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);
 	if (s->use_single_key)
 		setbuf(stdin, NULL);
+
+	if (add_p_opt->context != -1) {
+		if (add_p_opt->context < 0)
+			die(_("%s cannot be negative"), "--unified");
+		s->context = add_p_opt->context;
+	}
+	if (add_p_opt->interhunkcontext != -1) {
+		if (add_p_opt->interhunkcontext < 0)
+			die(_("%s cannot be negative"), "--inter-hunk-context");
+		s->interhunkcontext = add_p_opt->interhunkcontext;
+	}
 }
 
 void clear_add_i_state(struct add_i_state *s)

@@ -986,6 +998,10 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
 	opts->prompt = N_("Patch update");
 	count = list_and_choose(s, files, opts);
 	if (count > 0) {
+		struct add_p_opt add_p_opt = {
+			.context = s->context,
+			.interhunkcontext = s->interhunkcontext,
+		};
 		struct strvec args = STRVEC_INIT;
 		struct pathspec ps_selected = { 0 };
 

@@ -996,7 +1012,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
 		parse_pathspec(&ps_selected,
 			       PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
 			       PATHSPEC_LITERAL_PATH, "", args.v);
-		res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected);
+		res = run_add_p(s->r, ADD_P_ADD, &add_p_opt, NULL, &ps_selected);
 		strvec_clear(&args);
 		clear_pathspec(&ps_selected);
 	}

@@ -1031,10 +1047,13 @@ static int run_diff(struct add_i_state *s, const struct pathspec *ps,
 	if (count > 0) {
 		struct child_process cmd = CHILD_PROCESS_INIT;
 
-		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached",
-			     oid_to_hex(!is_initial ? &oid :
-					s->r->hash_algo->empty_tree),
-			     "--", NULL);
+		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached", NULL);
+		if (s->context != -1)
+			strvec_pushf(&cmd.args, "--unified=%i", s->context);
+		if (s->interhunkcontext != -1)
+			strvec_pushf(&cmd.args, "--inter-hunk-context=%i", s->interhunkcontext);
+		strvec_pushl(&cmd.args, oid_to_hex(!is_initial ? &oid :
+			     s->r->hash_algo->empty_tree), "--", NULL);
 		for (i = 0; i < files->items.nr; i++)
 			if (files->selected[i])
 				strvec_push(&cmd.args,

@@ -1127,7 +1146,8 @@ static void command_prompt_help(struct add_i_state *s)
 			 _("(empty) select nothing"));
 }
 
-int run_add_i(struct repository *r, const struct pathspec *ps)
+int run_add_i(struct repository *r, const struct pathspec *ps,
+	      struct add_p_opt *add_p_opt)
 {
 	struct add_i_state s = { NULL };
 	struct print_command_item_data data = { "[", "]" };

@@ -1170,7 +1190,7 @@ int run_add_i(struct repository *r, const struct pathspec *ps)
 			->util = util;
 	}
 
-	init_add_i_state(&s, r);
+	init_add_i_state(&s, r, add_p_opt);
 
 	/*
 	 * When color was asked for, use the prompt color for

index c63f35b14be8..4213dcd67b9a 100644
@@ -3,6 +3,13 @@
 
 #include "color.h"
 
+struct add_p_opt {
+	int context;
+	int interhunkcontext;
+};
+
+#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1 }
+
 struct add_i_state {
 	struct repository *r;
 	int use_color;

@@ -21,12 +28,14 @@ struct add_i_state {
 	int context, interhunkcontext;
 };
 
-void init_add_i_state(struct add_i_state *s, struct repository *r);
+void init_add_i_state(struct add_i_state *s, struct repository *r,
+		      struct add_p_opt *add_p_opt);
 void clear_add_i_state(struct add_i_state *s);
 
 struct repository;
 struct pathspec;
-int run_add_i(struct repository *r, const struct pathspec *ps);
+int run_add_i(struct repository *r, const struct pathspec *ps,
+	      struct add_p_opt *add_p_opt);
 
 enum add_p_mode {
 	ADD_P_ADD,

@@ -37,6 +46,7 @@ enum add_p_mode {
 };
 
 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);
 
 #endif

index b43ca1600738..c0d33820c558 100644
@@ -1766,14 +1766,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;

index 78dfb2657767..a7e6c77e7a74 100644
@@ -29,6 +29,7 @@ static const char * const builtin_add_usage[] = {
 	NULL
 };
 static int patch_interactive, add_interactive, edit_interactive;
+static struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
 static int take_worktree_changes;
 static int add_renormalize;
 static int pathspec_file_nul;

@@ -157,7 +158,7 @@ static int refresh(struct repository *repo, int verbose, const struct pathspec *
 int interactive_add(struct repository *repo,
 		    const char **argv,
 		    const char *prefix,
-		    int patch)
+		    int patch, struct add_p_opt *add_p_opt)
 {
 	struct pathspec pathspec;
 	int ret;

@@ -169,9 +170,9 @@ int interactive_add(struct repository *repo,
 		       prefix, argv);
 
 	if (patch)
-		ret = !!run_add_p(repo, ADD_P_ADD, NULL, &pathspec);
+		ret = !!run_add_p(repo, ADD_P_ADD, add_p_opt, NULL, &pathspec);
 	else
-		ret = !!run_add_i(repo, &pathspec);
+		ret = !!run_add_i(repo, &pathspec, add_p_opt);
 
 	clear_pathspec(&pathspec);
 	return ret;

@@ -253,6 +254,8 @@ static struct option builtin_add_options[] = {
 	OPT_GROUP(""),
 	OPT_BOOL('i', "interactive", &add_interactive, N_("interactive picking")),
 	OPT_BOOL('p', "patch", &patch_interactive, N_("select hunks interactively")),
+	OPT_DIFF_UNIFIED(&add_p_opt.context),
+	OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
 	OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")),
 	OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files"), 0),
 	OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")),

@@ -398,7 +401,12 @@ int cmd_add(int argc,
 			die(_("options '%s' and '%s' cannot be used together"), "--dry-run", "--interactive/--patch");
 		if (pathspec_from_file)
 			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
-		exit(interactive_add(repo, argv + 1, prefix, patch_interactive));
+		exit(interactive_add(repo, argv + 1, prefix, patch_interactive, &add_p_opt));
+	} else {
+		if (add_p_opt.context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--interactive/--patch");
+		if (add_p_opt.interhunkcontext != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--interactive/--patch");
 	}
 
 	if (edit_interactive) {

index d185982f3a63..b0b05b71bc29 100644
@@ -61,6 +61,8 @@ static const char * const restore_usage[] = {
 
 struct checkout_opts {
 	int patch_mode;
+	int patch_context;
+	int patch_interhunk_context;
 	int quiet;
 	int merge;
 	int force;

@@ -104,7 +106,12 @@ struct checkout_opts {
 	struct tree *source_tree;
 };
 
-#define CHECKOUT_OPTS_INIT { .conflict_style = -1, .merge = -1 }
+#define CHECKOUT_OPTS_INIT { \
+	.conflict_style = -1, \
+	.merge = -1, \
+	.patch_context = -1, \
+	.patch_interhunk_context = -1, \
+}
 
 struct branch_info {
 	char *name; /* The short name used */

@@ -539,6 +546,10 @@ static int checkout_paths(const struct checkout_opts *opts,
 
 	if (opts->patch_mode) {
 		enum add_p_mode patch_mode;
+		struct add_p_opt add_p_opt = {
+			.context = opts->patch_context,
+			.interhunkcontext = opts->patch_interhunk_context,
+		};
 		const char *rev = new_branch_info->name;
 		char rev_oid[GIT_MAX_HEXSZ + 1];
 

@@ -564,8 +575,13 @@ static int checkout_paths(const struct checkout_opts *opts,
 		else
 			BUG("either flag must have been set, worktree=%d, index=%d",
 			    opts->checkout_worktree, opts->checkout_index);
-		return !!run_add_p(the_repository, patch_mode, rev,
-				   &opts->pathspec);
+		return !!run_add_p(the_repository, patch_mode, &add_p_opt,
+				   rev, &opts->pathspec);
+	} else {
+		if (opts->patch_context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
+		if (opts->patch_interhunk_context != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
 	}
 
 	repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);

@@ -1738,6 +1754,8 @@ static struct option *add_checkout_path_options(struct checkout_opts *opts,
 			      N_("checkout their version for unmerged files"),
 			      3, PARSE_OPT_NONEG),
 		OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")),
+		OPT_DIFF_UNIFIED(&opts->patch_context),
+		OPT_DIFF_INTERHUNK_CONTEXT(&opts->patch_interhunk_context),
 		OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree,
 			 N_("do not limit pathspecs to sparse entries only")),
 		OPT_PATHSPEC_FROM_FILE(&opts->pathspec_from_file),

index 66bd91fd523d..19ec0ccb2bef 100644
@@ -19,6 +19,7 @@
 #include "environment.h"
 #include "diff.h"
 #include "commit.h"
+#include "add-interactive.h"
 #include "gettext.h"
 #include "revision.h"
 #include "wt-status.h"

@@ -122,6 +123,7 @@ static const char *edit_message, *use_message;
 static char *fixup_message, *fixup_commit, *squash_message;
 static const char *fixup_prefix;
 static int all, also, interactive, patch_interactive, only, amend, signoff;
+static struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
 static int edit_flag = -1; /* unspecified */
 static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
 static int config_commit_verbose = -1; /* unspecified */

@@ -400,7 +402,7 @@ static const char *prepare_index(const char **argv, const char *prefix,
 		old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
 		setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
 
-		if (interactive_add(the_repository, argv, prefix, patch_interactive) != 0)
+		if (interactive_add(the_repository, argv, prefix, patch_interactive, &add_p_opt) != 0)
 			die(_("interactive add failed"));
 
 		the_repository->index_file = old_repo_index_file;

@@ -424,6 +426,11 @@ static const char *prepare_index(const char **argv, const char *prefix,
 		commit_style = COMMIT_NORMAL;
 		ret = get_lock_file_path(&index_lock);
 		goto out;
+	} else {
+		if (add_p_opt.context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--interactive/--patch");
+		if (add_p_opt.interhunkcontext != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--interactive/--patch");
 	}
 
 	/*

@@ -1722,6 +1729,8 @@ int cmd_commit(int argc,
 		OPT_BOOL('i', "include", &also, N_("add specified files to index for commit")),
 		OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
 		OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
+		OPT_DIFF_UNIFIED(&add_p_opt.context),
+		OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
 		OPT_BOOL('o', "only", &only, N_("commit only specified files")),
 		OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
 		OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),

index 73b4537a9a56..62db07b0c231 100644
@@ -346,6 +346,7 @@ int cmd_reset(int argc,
 	struct object_id oid;
 	struct pathspec pathspec;
 	int intent_to_add = 0;
+	struct add_p_opt add_p_opt = ADD_P_OPT_INIT;
 	const struct option options[] = {
 		OPT__QUIET(&quiet, N_("be quiet, only report errors")),
 		OPT_BOOL(0, "no-refresh", &no_refresh,

@@ -370,6 +371,8 @@ int cmd_reset(int argc,
 			       PARSE_OPT_OPTARG,
 			       option_parse_recurse_submodules_worktree_updater),
 		OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
+		OPT_DIFF_UNIFIED(&add_p_opt.context),
+		OPT_DIFF_INTERHUNK_CONTEXT(&add_p_opt.interhunkcontext),
 		OPT_BOOL('N', "intent-to-add", &intent_to_add,
 				N_("record only the fact that removed paths will be added later")),
 		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),

@@ -424,9 +427,14 @@ int cmd_reset(int argc,
 		if (reset_type != NONE)
 			die(_("options '%s' and '%s' cannot be used together"), "--patch", "--{hard,mixed,soft}");
 		trace2_cmd_mode("patch-interactive");
-		update_ref_status = !!run_add_p(the_repository, ADD_P_RESET, rev,
-				   &pathspec);
+		update_ref_status = !!run_add_p(the_repository, ADD_P_RESET,
+						&add_p_opt, rev, &pathspec);
 		goto cleanup;
+	} else {
+		if (add_p_opt.context != -1)
+			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
+		if (add_p_opt.interhunkcontext != -1)
+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
 	}
 
 	/* git reset tree [--] paths... can be used to

index 70c870dae4d4..7a7fedbc2f14 100644
@@ -2,6 +2,7 @@
 #define COMMIT_H
 
 #include "object.h"
+#include "add-interactive.h"
 
 struct signature_check;
 struct strbuf;

@@ -257,7 +258,7 @@ int for_each_commit_graft(each_commit_graft_fn, void *);
 int interactive_add(struct repository *repo,
 		    const char **argv,
 		    const char *prefix,
-		    int patch);
+		    int patch, struct add_p_opt *add_p_opt);
 
 struct commit_extra_header {
 	struct commit_extra_header *next;

index 91c3e3c29b3d..bdae8f116198 100644
@@ -616,6 +616,8 @@ int parse_opt_tracking_mode(const struct option *, const char *, int);
 #define OPT_PATHSPEC_FROM_FILE(v) OPT_FILENAME(0, "pathspec-from-file", v, N_("read pathspec from file"))
 #define OPT_PATHSPEC_FILE_NUL(v)  OPT_BOOL(0, "pathspec-file-nul", v, N_("with --pathspec-from-file, pathspec elements are separated with NUL character"))
 #define OPT_AUTOSTASH(v) OPT_BOOL(0, "autostash", v, N_("automatically stash/stash pop before and after"))
+#define OPT_DIFF_UNIFIED(v) OPT_INTEGER_F('U', "unified", v, N_("generate diffs with <n> lines context"), PARSE_OPT_NONEG)
+#define OPT_DIFF_INTERHUNK_CONTEXT(v) OPT_INTEGER_F(0, "inter-hunk-context", v, N_("show context between diff hunks up to the specified number of lines"), PARSE_OPT_NONEG)
 
 #define OPT_IPVERSION(v) \
 	OPT_SET_INT_F('4', "ipv4", (v), N_("use IPv4 addresses only"), \

index c4b861c360cc..07d993ba6762 100755
@@ -98,6 +98,36 @@ test_expect_success 'The -U option overrides diff.context' '
 	test_grep ! "^ firstline" output
 '
 
+test_expect_success 'The -U option overrides diff.context for "add"' '
+	test_config diff.context 8 &&
+	git add -U4 -p >output &&
+	test_grep ! "^ firstline" output
+'
+
+test_expect_success 'The -U option overrides diff.context for "commit"' '
+	test_config diff.context 8 &&
+	! git commit -U4 -p >output &&
+	test_grep ! "^ firstline" output
+'
+
+test_expect_success 'The -U option overrides diff.context for "checkout"' '
+	test_config diff.context 8 &&
+	git checkout -U4 -p >output &&
+	test_grep ! "^ firstline" output
+'
+
+test_expect_success 'The -U option overrides diff.context for "stash"' '
+	test_config diff.context 8 &&
+	! git stash -U4 -p >output &&
+	test_grep ! "^ firstline" output
+'
+
+test_expect_success 'The -U option overrides diff.context for "restore"' '
+	test_config diff.context 8 &&
+	git restore -U4 -p >output &&
+	test_grep ! "^ firstline" output
+'
+
 test_expect_success 'diff.context honored by "diff"' '
 	test_config diff.context 8 &&
 	git diff >output &&

index 343b8cd1912b..6650d33fba69 100755
@@ -2596,6 +2596,8 @@ test_expect_success 'double dash "git checkout"' '
 	--merge Z
 	--conflict=Z
 	--patch Z
+	--unified=Z
+	--inter-hunk-context=Z
 	--ignore-skip-worktree-bits Z
 	--ignore-other-worktrees Z
 	--recurse-submodules Z

gitgitgadget

These mostly look sensible, but I would title & phrase the commit description to 'use "test_grep"', not 'refactor to &'. It's shorter and more direct ;-)

Thanks.

Thanks - will make sure to change that in v3 :)

Yes, I did of course notice documentation for git diff also has these; ultimately my justification for not changing that to use this new .adoc include as well was for a couple reasons:
- these two options are not together in the git diff documentation (not *so* important, and they probably should actually be together?)
- there is an extra if def which adds on "implies --patch" text in the git diff documentation which isn't the behaviour the add-patch commands are going for, so that makes the intent a little different here

But would be good to hear if anyone else has any thoughts.

Hi Leon

We could expand this slightly by adding

This is because the plumbing commands used by "git add -p" to generate the diff do not read those config settings. Fix this by reading the config before generating the patch and passing it along to the diff command with the "-U" and "--inter-hunk-context" command-line options.

	test_write_lines a b c d e f g h i j k l m >file &&
	git add file &&
	test_write_lines a b c d e f G h i j k l m >file &&
	echo y | git -c diff.context=5 add -p >actual &&
	test_grep "@@ -2,11 +2,11 @@" actual

	test_write_lines a b c d e f g h i j k l m n o p q r s >file &&
	git add file &&
	test_write_lines a b c d E f g i i j k l m N o p q r s >file &&
	echo y | git -c diff.interhunkcontext=2 add -p >actual &&
	test_grep "@@ -2,16 +2,16 @@" actual

Hi Leon

The code changes here mostly look good, I've left a few comments below. I think the tests could be improved, I've left some suggestions on limiting the number of tests while improving the coverage. The new tests I'm suggesting that check invalid option combinations are the basis for most of my code comments.

There is still the issue of what to do with -U0. As I mentioned previously "git apply" will fail when we try to apply the patch. We can either pass the appropriate flag when the context is zero or possibly use -U0 to mean the default number of context lines.

This is a bit verbose but it matches what is in diff.c.

	test_expect_success "${cmd%% *} accepts -U and --inter-hunk-context" "
		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
		git add file &&
		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
		test_grep \"@@ -2,20 +2,20 @@\" actual
	"

	test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
	git commit -m file file &&
	test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
	git add file &&
	echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
		reset -p -U 4 --inter-hunk-context 2 >actual &&
	test_grep "@@ -2,20 +2,20 @@" actual

	test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
	git commit -m file file &&
	test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
	echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
		stash -p -U 4 --inter-hunk-context 2 >actual &&
	test_grep "@@ -2,20 +2,20 @@" actual

	test_expect_success "$cmd rejects invalid context options" "
		test_must_fail git $cmd -p -U -3 2>actual &&
		test_grep -e \"--unified cannot be negative\" actual &&

		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
		test_grep -e \"--inter-hunk-context cannot be negative\" actual &&

		test_must_fail git $cmd -U 7 2>actual &&
		test_grep -E \".--unified. requires .(--interactive/)?--patch.\" actual &&

		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
		test_grep -E \".--inter-hunk-context. requires 
.(--interactive/)?--patch.\" actual
	"

Looking more closely the problem is that it quits if there are no changes to stash before validating -U or --inter-hunk-context. I think it should validate the options before checking if there is anything to stash.

Best Wishes

Phillip

Hey, thanks for the thorough review Philip. I will properly digest this when I get some free time, but I just wanted to say (I probably should have mentioned this so my bad) that the reason I didn't change to test just the singular command (yet, anyway) is that someone else thought this was a good idea testing all of them, so I wasn't sure whether to touch it or not in the end, and thought I'd just submit this v2 and gather more opinions. Was this perhaps the wrong approach though?

Lose the ';' (semicolon) after closing {brace}s. This is C; you do not need an empty statement after a {block}.

Everything in your review I am very happy to see. Thanks for giving a great review.

Hi Leon

I'd missed that message - have you got a link to it please

If you get conflicting advise then it is a good idea to mention that in the cover letter and explain which option you went with and why.

Best Wishes

Phillip

Oh well spotted, I'd missed that

Thanks

Phillip

Heh, with enough number of eyeballs, all the bugs are shallow.

This series of patches attempt to give --interactive/--patch compatible builtins ("add", "commit", "checkout", "reset", "restore" and "stash") better support and nicer experience for configuring how many context lines are shown in diffs through a variety of ways.

Prior to these patches, the user could not choose how many context lines they saw in --patch commands (apart from one workaround by using GIT_DIFF_OPTS=-u<number> ..., however this isn't a good user experience or a persistent solution). Additionally, the behaviour around reading from the diff.context and diff.interHunkContext configs was also inconsistent with other diff generating commands such as "log -p".

The summarised changes below hopefully make this experience better and fix some inconsistencies:

* diff.context and diff.interHunkContext configs are now respected by --patch compatible commands
* --unified and --inter-hunk-context command line options have been added to --patch compatible commands (which take prescendence over file configs)
* "add" and "commit" in --interactive mode now expose a new "context" subcommand which configures the amount of context lines you wish to see in subsequent diffs generated from other subcommands such as "patch" or "diff"

The original discussion for this can be read at:

* https://lore.kernel.org/git/CAP9jKjGb-Rcr=RLJEzeFdtrekYM+qmHy+1T1fykU3n9cV4GhGw@mail.gmail.com/

Changes since v1:

* Update commit descriptions
* Update tests to use the more modern and robust test_grep and test_config utils
* Reword some documentation / user messages
* Ensure each commit is atomic and builds/passes tests on it's own
* Make new command line options DRY
* Add tests for interhunk context interaction
* Error if context config/command line options are negative
* Drop previous last commit to do with new subcommand for --interactive add/commit. My motivations behind this patch series originally where quite simple, just for add-patch commands to respect context configs. This subcommand, after the discussion in v1, will require more thought and a larger implementation that what I had anticipated. I would prefer to leave this for another time as it's the least impactful but the most time intensive and complicated idea.

Changes since v2:

* Update tests to only test single command (following Philip's suggestion)
* Add negative option checks
* Minor commit re-wording

Leon Michalak (4):
test: use "test_grep"
test: use "test_config"
add-patch: respect diff.context configuration
add-patch: add diff.context command line overrides

 Documentation/diff-context-options.adoc |  10 ++
 Documentation/git-add.adoc              |   2 +
 Documentation/git-checkout.adoc         |   2 +
 Documentation/git-commit.adoc           |   2 +
 Documentation/git-reset.adoc            |   2 +
 Documentation/git-restore.adoc          |   2 +
 Documentation/git-stash.adoc            |   2 +
 add-interactive.c                       |  53 +++++++++--
 add-interactive.h                       |  17 +++-
 add-patch.c                             |  11 ++-
 builtin/add.c                           |  21 ++++-
 builtin/checkout.c                      |  31 +++++-
 builtin/commit.c                        |  16 +++-
 builtin/reset.c                         |  17 +++-
 builtin/stash.c                         |  56 ++++++++---
 commit.h                                |   3 +-
 parse-options.h                         |   2 +
 t/t3701-add-interactive.sh              | 119 +++++++++++++++++++-----
 t/t4055-diff-context.sh                 |  72 +++++++++-----
 t/t9902-completion.sh                   |   2 +
 20 files changed, 362 insertions(+), 80 deletions(-)
 create mode 100644 Documentation/diff-context-options.adoc

base-commit: cf6f63ea6bf35173e02e18bdc6a4ba41288acff9
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1915%2FNinjaInShade%2Finteractive-patch-context-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1915/NinjaInShade/interactive-patch-context-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/1915

Range-diff vs v2:

1: 4f92a1b4c24 ! 1: 044a93014b6 test: refactor to use "test_grep"
@@ Metadata
Author: Leon Michalak <[email protected]>

## Commit message ##
- test: refactor to use "test_grep"
+ test: use "test_grep"

- Refactor to use the modern "test_grep" test utility instead of regular
- "grep" which provides better debug information if tests fail.
+ Use the modern "test_grep" test utility instead of regular "grep" which
+ provides better debug information if tests fail.

This is a prerequisite to the commits that follow which add to both test files.
2: 75424cb8e1c ! 2: e5c40d37750 test: refactor to use "test_config"
@@ Metadata
Author: Leon Michalak <[email protected]>

## Commit message ##
- test: refactor to use "test_config"
+ test: use "test_config"

- Refactor to use the modern "test_config" test utility instead of manual
- "git config" as the former provides clean up on test completion.
+ Use the modern "test_config" test utility instead of manual"git config"
+ as the former provides clean up on test completion.

This is a prerequisite to the commits that follow which add to this test file.
3: f16d3de8611 ! 3: 1ec8a138486 add-patch: respect diff.context configuration

     @@ Commit message
          the user's diff.context and diff.interHunkContext file configurations.
          This patch fixes this inconsistency.
      
     +    This is because the plumbing commands used by "git add -p" to generate
     +    the diff do not read those config settings. Fix this by reading the
     +    config before generating the patch and passing it along to the diff
     +    command with the "-U" and "--inter-hunk-context" command-line options.
     +
          Signed-off-by: Leon Michalak <[email protected]>
      
       ## add-interactive.c ##
     @@ add-interactive.c: void init_add_i_state(struct add_i_state *s, struct repositor
      +			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)
     @@ add-patch.c: static int parse_diff(struct add_p_state *s, const struct pathspec
       		strvec_pushf(&args, "--diff-algorithm=%s", diff_algorithm);
       	if (s->revision) {
      
     - ## t/t4055-diff-context.sh ##
     -@@ t/t4055-diff-context.sh: test_expect_success 'diff.context honored by "log"' '
     - 	test_grep "^ firstline" output
     + ## t/t3701-add-interactive.sh ##
     +@@ t/t3701-add-interactive.sh: test_expect_success 'hunk splitting works with diff.suppressBlankEmpty' '
     + 	test_cmp expect actual
       '
       
     -+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 'add -p respects diff.context' '
     ++	test_write_lines a b c d e f g h i j k l m >file &&
     ++	git add file &&
     ++	test_write_lines a b c d e f G h i j k l m >file &&
     ++	echo y | git -c diff.context=5 add -p >actual &&
     ++	test_grep "@@ -2,11 +2,11 @@" actual
      +'
      +
     -+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 'add -p respects diff.interHunkContext' '
     ++	test_write_lines a b c d e f g h i j k l m n o p q r s >file &&
     ++	git add file &&
     ++	test_write_lines a b c d E f g i i j k l m N o p q r s >file &&
     ++	echo y | git -c diff.interhunkcontext=2 add -p >actual &&
     ++	test_grep "@@ -2,16 +2,16 @@" actual
      +'
      +
     - test_expect_success 'The -U option overrides diff.context' '
     - 	test_config diff.context 8 &&
     - 	git log -U4 -1 >output &&
     -@@ t/t4055-diff-context.sh: test_expect_success 'negative integer config parsing' '
     - 	test_grep "bad config variable" output
     - '
     - 
     -+test_expect_success 'negative integer config parsing by "add"' '
     ++test_expect_success 'add -p rejects negative diff.context' '
      +	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 &&
     + test_done
 4:  973dfadd1b3 ! 4:  b68c58b667c add-patch: add diff.context command line overrides
     @@ Documentation/git-checkout.adoc: section of linkgit:git-add[1] to learn how to o
       
      +include::diff-context-options.adoc[]
      +
     - --ignore-other-worktrees::
     + `--ignore-other-worktrees`::
       	`git checkout` refuses when the wanted branch is already checked
       	out or otherwise in use by another worktree. This option makes
      
     @@ builtin/add.c: static struct option builtin_add_options[] = {
       	OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")),
       	OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files"), 0),
       	OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")),
     +@@ builtin/add.c: int cmd_add(int argc,
     + 	prepare_repo_settings(repo);
     + 	repo->settings.command_requires_full_index = 0;
     + 
     ++	if (add_p_opt.context < -1)
     ++		die(_("'%s' cannot be negative"), "--unified");
     ++	if (add_p_opt.interhunkcontext < -1)
     ++		die(_("'%s' cannot be negative"), "--inter-hunk-context");
     ++
     + 	if (patch_interactive)
     + 		add_interactive = 1;
     + 	if (add_interactive) {
      @@ builtin/add.c: int cmd_add(int argc,
       			die(_("options '%s' and '%s' cannot be used together"), "--dry-run", "--interactive/--patch");
       		if (pathspec_from_file)
     @@ builtin/checkout.c: static int checkout_paths(const struct checkout_opts *opts,
      -				   &opts->pathspec);
      +		return !!run_add_p(the_repository, patch_mode, &add_p_opt,
      +				   rev, &opts->pathspec);
     -+	} else {
     -+		if (opts->patch_context != -1)
     -+			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
     -+		if (opts->patch_interhunk_context != -1)
     -+			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
       	}
       
       	repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);
     @@ builtin/checkout.c: static struct option *add_checkout_path_options(struct check
       		OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree,
       			 N_("do not limit pathspecs to sparse entries only")),
       		OPT_PATHSPEC_FROM_FILE(&opts->pathspec_from_file),
     +@@ builtin/checkout.c: static int checkout_main(int argc, const char **argv, const char *prefix,
     + 	argc = parse_options(argc, argv, prefix, options,
     + 			     usagestr, parseopt_flags);
     + 
     ++	if (opts->patch_context < -1)
     ++		die(_("'%s' cannot be negative"), "--unified");
     ++	if (opts->patch_interhunk_context < -1)
     ++		die(_("'%s' cannot be negative"), "--inter-hunk-context");
     ++
     ++	if (!opts->patch_mode) {
     ++		if (opts->patch_context != -1)
     ++			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
     ++		if (opts->patch_interhunk_context != -1)
     ++			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
     ++	}
     ++
     + 	if (opts->show_progress < 0) {
     + 		if (opts->quiet)
     + 			opts->show_progress = 0;
      
       ## builtin/commit.c ##
      @@
     @@ builtin/commit.c: static const char *edit_message, *use_message;
       static int edit_flag = -1; /* unspecified */
       static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
       static int config_commit_verbose = -1; /* unspecified */
     +@@ builtin/commit.c: static const char *prepare_index(const char **argv, const char *prefix,
     + 	const char *ret;
     + 	char *path = NULL;
     + 
     ++	if (add_p_opt.context < -1)
     ++		die(_("'%s' cannot be negative"), "--unified");
     ++	if (add_p_opt.interhunkcontext < -1)
     ++		die(_("'%s' cannot be negative"), "--inter-hunk-context");
     ++
     + 	if (is_status)
     + 		refresh_flags |= REFRESH_UNMERGED;
     + 	parse_pathspec(&pathspec, 0,
      @@ builtin/commit.c: static const char *prepare_index(const char **argv, const char *prefix,
       		old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
       		setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
     @@ builtin/reset.c: int cmd_reset(int argc,
       		OPT_BOOL('N', "intent-to-add", &intent_to_add,
       				N_("record only the fact that removed paths will be added later")),
       		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
     +@@ builtin/reset.c: int cmd_reset(int argc,
     + 		oidcpy(&oid, &tree->object.oid);
     + 	}
     + 
     ++	if (add_p_opt.context < -1)
     ++		die(_("'%s' cannot be negative"), "--unified");
     ++	if (add_p_opt.interhunkcontext < -1)
     ++		die(_("'%s' cannot be negative"), "--inter-hunk-context");
     ++
     + 	prepare_repo_settings(the_repository);
     + 	the_repository->settings.command_requires_full_index = 0;
     + 
      @@ builtin/reset.c: int cmd_reset(int argc,
       		if (reset_type != NONE)
       			die(_("options '%s' and '%s' cannot be used together"), "--patch", "--{hard,mixed,soft}");
     @@ builtin/stash.c: static int push_stash(int argc, const char **argv, const char *
      +		if (add_p_opt.interhunkcontext != -1)
      +			die(_("the option '%s' requires '%s'"), "--inter-hunk-context", "--patch");
      +	}
     ++
     ++	if (add_p_opt.context < -1)
     ++		die(_("'%s' cannot be negative"), "--unified");
     ++	if (add_p_opt.interhunkcontext < -1)
     ++		die(_("'%s' cannot be negative"), "--inter-hunk-context");
      +
       	ret = do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
      -			    include_untracked, only_staged);
     @@ builtin/stash.c: static int save_stash(int argc, const char **argv, const char *
       
       	memset(&ps, 0, sizeof(ps));
      +
     ++	if (add_p_opt.context < -1)
     ++		die(_("'%s' cannot be negative"), "--unified");
     ++	if (add_p_opt.interhunkcontext < -1)
     ++		die(_("'%s' cannot be negative"), "--inter-hunk-context");
     ++
      +	if (!patch_mode) {
      +		if (add_p_opt.context != -1)
      +			die(_("the option '%s' requires '%s'"), "--unified", "--patch");
     @@ parse-options.h: int parse_opt_tracking_mode(const struct option *, const char *
       #define OPT_IPVERSION(v) \
       	OPT_SET_INT_F('4', "ipv4", (v), N_("use IPv4 addresses only"), \
      
     - ## t/t4032-diff-inter-hunk-context.sh ##
     -@@ t/t4032-diff-inter-hunk-context.sh: t() {
     - 	"
     - }
     + ## t/t3701-add-interactive.sh ##
     +@@ t/t3701-add-interactive.sh: test_expect_success 'add -p rejects negative diff.context' '
     + 	test_grep "diff.context cannot be negative" output
     + '
       
     -+t_patch() {
     -+	use_config=
     -+	git config --unset diff.interHunkContext
     -+
     -+	case $# in
     -+	4) hunks=$4; cmd="add -p -U$3";;
     -+	5) hunks=$5; cmd="add -p -U$3 --inter-hunk-context=$4";;
     -+	6) hunks=$5; cmd="add -p -U$3"; git config diff.interHunkContext $4; use_config="(diff.interHunkContext=$4) ";;
     -+	esac
     -+	label="$use_config$cmd, $1 common $2"
     -+	file=f$1
     -+
     -+	if ! test -f $file
     -+	then
     -+		f A $1 B >$file
     -+		git add $file
     -+		git commit -q -m. $file
     -+		f X $1 Y >$file
     -+	fi
     -+
     -+	test_expect_success "$label: count hunks ($hunks)" "
     -+		test $(test_write_lines q | git $cmd $file | sed -n 's/^([0-9]*\/\([0-9]*\)) Stage this hunk.*/\1/p') = $hunks
     ++for cmd in add checkout restore 'commit -m file'
     ++do
     ++	test_expect_success "${cmd%% *} accepts -U and --inter-hunk-context" "
     ++		test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
     ++		git add file &&
     ++		test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
     ++		echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
     ++			$cmd -p -U 4 --inter-hunk-context 2 >actual &&
     ++		test_grep \"@@ -2,20 +2,20 @@\" actual
      +	"
     -+}
     ++done
     ++
     ++test_expect_success 'reset accepts -U and --inter-hunk-context' '
     ++	test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
     ++	git commit -m file file &&
     ++	test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
     ++	git add file &&
     ++	echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
     ++		reset -p -U 4 --inter-hunk-context 2 >actual &&
     ++	test_grep "@@ -2,20 +2,20 @@" actual
     ++'
     ++
     ++test_expect_success 'stash accepts -U and --inter-hunk-context' '
     ++	test_write_lines a b c d e F g h i j k l m n o p Q r s t u v >file &&
     ++	git commit -m file file &&
     ++	test_write_lines a b c d e f g h i j k l m n o p q r s t u v >file &&
     ++	echo y | git -c diff.context=5 -c diff.interhunkcontext=1 \
     ++		stash -p -U 4 --inter-hunk-context 2 >actual &&
     ++	test_grep "@@ -2,20 +2,20 @@" actual
     ++'
     ++
     ++for cmd in add checkout commit reset restore 'stash save' 'stash push'
     ++do
     ++	test_expect_success "$cmd rejects invalid context options" "
     ++		test_must_fail git $cmd -p -U -3 2>actual &&
     ++		cat actual | echo &&
     ++		test_grep -e \"'--unified' cannot be negative\" actual &&
     ++
     ++		test_must_fail git $cmd -p --inter-hunk-context -3 2>actual &&
     ++		test_grep -e \"'--inter-hunk-context' cannot be negative\" actual &&
     ++
     ++		test_must_fail git $cmd -U 7 2>actual &&
     ++		test_grep -E \"'--unified' requires '(--interactive/)?--patch'\" actual &&
     ++
     ++		test_must_fail git $cmd --inter-hunk-context 2 2>actual &&
     ++		test_grep -E \"'--inter-hunk-context' requires '(--interactive/)?--patch'\" actual
     ++	"
     ++done
      +
     - cat <<EOF >expected.f1.0.1 || exit 1
     - diff --git a/f1 b/f1
     - --- a/f1
     -@@ t/t4032-diff-inter-hunk-context.sh: t 3 lines	1	2	1	config
     - t 9 lines	3	2	2	config
     - t 9 lines	3	3	1	config
     - 
     -+# common lines	ctx	intrctx	hunks
     -+t_patch 1 line	0		2
     -+t_patch 1 line	0	0	2
     -+t_patch 1 line	0	1	1
     -+t_patch 1 line	0	2	1
     -+t_patch 1 line	1		1
     -+
     -+t_patch 2 lines	0		2
     -+t_patch 2 lines	0	0	2
     -+t_patch 2 lines	0	1	2
     -+t_patch 2 lines	0	2	1
     -+t_patch 2 lines	1		1
     -+
     -+t_patch 3 lines	1		2
     -+t_patch 3 lines	1	0	2
     -+t_patch 3 lines	1	1	1
     -+t_patch 3 lines	1	2	1
     -+
     -+t_patch 9 lines	3		2
     -+t_patch 9 lines	3	2	2
     -+t_patch 9 lines	3	3	1
     -+
     -+#					use diff.interHunkContext?
     -+t_patch 1 line	0	0	2	config
     -+t_patch 1 line	0	1	1	config
     -+t_patch 1 line	0	2	1	config
     -+t_patch 9 lines	3	3	1	config
     -+t_patch 2 lines	0	0	2	config
     -+t_patch 2 lines	0	1	2	config
     -+t_patch 2 lines	0	2	1	config
     -+t_patch 3 lines	1	0	2	config
     -+t_patch 3 lines	1	1	1	config
     -+t_patch 3 lines	1	2	1	config
     -+t_patch 9 lines	3	2	2	config
     -+t_patch 9 lines	3	3	1	config
     -+
     - test_expect_success 'diff.interHunkContext invalid' '
     - 	git config diff.interHunkContext asdf &&
     - 	test_must_fail git diff &&
     + test_done
      
       ## t/t4055-diff-context.sh ##
      @@ t/t4055-diff-context.sh: test_expect_success 'The -U option overrides diff.context' '

gitgitgadget

From: Leon Michalak <[email protected]>

Use the modern "test_grep" test utility instead of regular "grep" which provides better debug information if tests fail.

This is a prerequisite to the commits that follow which add to both test files.

---
 t/t3701-add-interactive.sh | 48 +++++++++++++++++++-------------------
 t/t4055-diff-context.sh    | 28 +++++++++++-----------
 2 files changed, 38 insertions(+), 38 deletions(-)

index b8a05d95f3f1..b088ee141ff4 100755
@@ -63,7 +63,7 @@ test_expect_success 'setup (initial)' '
 '
 test_expect_success 'status works (initial)' '
 	git add -i </dev/null >output &&
-	grep "+1/-0 *+2/-0 file" output
+	test_grep "+1/-0 *+2/-0 file" output
 '
 
 test_expect_success 'setup expected' '

@@ -86,7 +86,7 @@ test_expect_success 'revert works (initial)' '
 	git add file &&
 	test_write_lines r 1 | git add -i &&
 	git ls-files >output &&
-	! grep . output
+	test_grep ! . output
 '
 
 test_expect_success 'add untracked (multiple)' '

@@ -109,7 +109,7 @@ test_expect_success 'setup (commit)' '
 '
 test_expect_success 'status works (commit)' '
 	git add -i </dev/null >output &&
-	grep "+1/-0 *+2/-0 file" output
+	test_grep "+1/-0 *+2/-0 file" output
 '
 
 test_expect_success 'update can stage deletions' '

@@ -141,7 +141,7 @@ test_expect_success 'revert works (commit)' '
 	git add file &&
 	test_write_lines r 1 | git add -i &&
 	git add -i </dev/null >output &&
-	grep "unchanged *+3/-0 file" output
+	test_grep "unchanged *+3/-0 file" output
 '
 
 test_expect_success 'reject multi-key input' '

@@ -185,7 +185,7 @@ test_expect_success 'setup fake editor' '
 test_expect_success 'bad edit rejected' '
 	git reset &&
 	test_write_lines e n d | git add -p >output &&
-	grep "hunk does not apply" output
+	test_grep "hunk does not apply" output
 '
 
 test_expect_success 'setup patch' '

@@ -198,7 +198,7 @@ test_expect_success 'setup patch' '
 test_expect_success 'garbage edit rejected' '
 	git reset &&
 	test_write_lines e n d | git add -p >output &&
-	grep "hunk does not apply" output
+	test_grep "hunk does not apply" output
 '
 
 test_expect_success 'setup patch' '

@@ -313,8 +313,8 @@ test_expect_success FILEMODE 'stage mode and hunk' '
 	chmod +x file &&
 	printf "y\\ny\\n" | git add -p &&
 	git diff --cached file >out &&
-	grep "new mode" out &&
-	grep "+content" out &&
+	test_grep "new mode" out &&
+	test_grep "+content" out &&
 	git diff file >out &&
 	test_must_be_empty out
 '

@@ -636,7 +636,7 @@ test_expect_success 'split hunk "add -p (edit)"' '
 	printf "%s\n" s e     q n q q |
 	EDITOR=: git add -p &&
 	git diff >actual &&
-	! grep "^+15" actual
+	test_grep ! "^+15" actual
 '
 
 test_expect_success 'split hunk "add -p (no, yes, edit)"' '

@@ -648,7 +648,7 @@ test_expect_success 'split hunk "add -p (no, yes, edit)"' '
 	EDITOR=: git add -p 2>error &&
 	test_must_be_empty error &&
 	git diff >actual &&
-	! grep "^+31" actual
+	test_grep ! "^+31" actual
 '
 
 test_expect_success 'split hunk with incomplete line at end' '

@@ -682,7 +682,7 @@ test_expect_success 'edit, adding lines to the first hunk' '
 	EDITOR=./fake_editor.sh git add -p 2>error &&
 	test_must_be_empty error &&
 	git diff --cached >actual &&
-	grep "^+22" actual
+	test_grep "^+22" actual
 '
 
 test_expect_success 'patch mode ignores unmerged entries' '

@@ -696,7 +696,7 @@ test_expect_success 'patch mode ignores unmerged entries' '
 	test_must_fail git merge side &&
 	echo changed >non-conflict.t &&
 	echo y | git add -p >output &&
-	! grep a/conflict.t output &&
+	test_grep ! a/conflict.t output &&
 	cat >expected <<-\EOF &&
 	* Unmerged path conflict.t
 	diff --git a/non-conflict.t b/non-conflict.t

@@ -728,7 +728,7 @@ test_expect_success 'diffs can be colorized' '
 
 	# We do not want to depend on the exact coloring scheme
 	# git uses for diffs, so just check that we saw some kind of color.
-	grep "$(printf "\\033")" output
+	test_grep "$(printf "\\033")" output
 '
 
 test_expect_success 'colors can be overridden' '

@@ -743,7 +743,7 @@ test_expect_success 'colors can be overridden' '
 		-c color.interactive.error=blue \
 		add -i 2>err.raw <input &&
 	test_decode_color <err.raw >err &&
-	grep "<BLUE>Huh (trigger)?<RESET>" err &&
+	test_grep "<BLUE>Huh (trigger)?<RESET>" err &&
 
 	test_write_lines help quit >input &&
 	force_color git \

@@ -863,7 +863,7 @@ test_expect_success 'colorized diffs respect diff.wsErrorHighlight' '
 	printf y >y &&
 	force_color git -c diff.wsErrorHighlight=all add -p >output.raw 2>&1 <y &&
 	test_decode_color <output.raw >output &&
-	grep "old<" output
+	test_grep "old<" output
 '
 
 test_expect_success 'diffFilter filters diff' '

@@ -876,7 +876,7 @@ test_expect_success 'diffFilter filters diff' '
 
 	# avoid depending on the exact coloring or content of the prompts,
 	# and just make sure we saw our diff prefixed
-	grep foo:.*content output
+	test_grep foo:.*content output
 '
 
 test_expect_success 'detect bogus diffFilter output' '

@@ -886,7 +886,7 @@ test_expect_success 'detect bogus diffFilter output' '
 	test_config interactive.diffFilter "sed 6d" &&
 	printf y >y &&
 	force_color test_must_fail git add -p <y >output 2>&1 &&
-	grep "mismatched output" output
+	test_grep "mismatched output" output
 '
 
 test_expect_success 'handle iffy colored hunk headers' '

@@ -896,7 +896,7 @@ test_expect_success 'handle iffy colored hunk headers' '
 	printf n >n &&
 	force_color git -c interactive.diffFilter="sed s/.*@@.*/XX/" \
 		add -p >output 2>&1 <n &&
-	grep "^XX$" output
+	test_grep "^XX$" output
 '
 
 test_expect_success 'handle very large filtered diff' '

@@ -1002,7 +1002,7 @@ test_expect_success 'add -p does not expand argument lists' '
 	# update it, but we want to be sure that our "." pathspec
 	# was not expanded into the argument list of any command.
 	# So look only for "not-changed".
-	! grep -E "^trace: (built-in|exec|run_command): .*not-changed" trace.out
+	test_grep ! -E "^trace: (built-in|exec|run_command): .*not-changed" trace.out
 '
 
 test_expect_success 'hunk-editing handles custom comment char' '

@@ -1072,21 +1072,21 @@ test_expect_success 'setup different kinds of dirty submodules' '
 
 test_expect_success 'status ignores dirty submodules (except HEAD)' '
 	git -C for-submodules add -i </dev/null >output &&
-	grep dirty-head output &&
-	grep dirty-both-ways output &&
-	! grep dirty-otherwise output
+	test_grep dirty-head output &&
+	test_grep dirty-both-ways output &&
+	test_grep ! dirty-otherwise output
 '
 
 test_expect_success 'handle submodules' '
 	echo 123 >>for-submodules/dirty-otherwise/initial.t &&
 
 	force_color git -C for-submodules add -p dirty-otherwise >output 2>&1 &&
-	grep "No changes" output &&
+	test_grep "No changes" output &&
 
 	force_color git -C for-submodules add -p dirty-head >output 2>&1 <y &&
 	git -C for-submodules ls-files --stage dirty-head >actual &&
 	rev="$(git -C for-submodules/dirty-head rev-parse HEAD)" &&
-	grep "$rev" actual
+	test_grep "$rev" actual
 '
 
 test_expect_success 'set up pathological context' '

index ec2804eea67c..c66f966a3ab3 100755
@@ -38,36 +38,36 @@ test_expect_success 'setup' '
 
 test_expect_success 'the default number of context lines is 3' '
 	git diff >output &&
-	! grep "^ d" output &&
-	grep "^ e" output &&
-	grep "^ j" output &&
-	! grep "^ k" output
+	test_grep ! "^ d" output &&
+	test_grep "^ e" output &&
+	test_grep "^ j" output &&
+	test_grep ! "^ k" output
 '
 
 test_expect_success 'diff.context honored by "log"' '
 	git log -1 -p >output &&
-	! grep firstline output &&
+	test_grep ! firstline output &&
 	git config diff.context 8 &&
 	git log -1 -p >output &&
-	grep "^ firstline" output
+	test_grep "^ firstline" output
 '
 
 test_expect_success 'The -U option overrides diff.context' '
 	git config diff.context 8 &&
 	git log -U4 -1 >output &&
-	! grep "^ firstline" output
+	test_grep ! "^ firstline" output
 '
 
 test_expect_success 'diff.context honored by "diff"' '
 	git config diff.context 8 &&
 	git diff >output &&
-	grep "^ firstline" output
+	test_grep "^ firstline" output
 '
 
 test_expect_success 'plumbing not affected' '
 	git config diff.context 8 &&
 	git diff-files -p >output &&
-	! grep "^ firstline" output
+	test_grep ! "^ firstline" output
 '
 
 test_expect_success 'non-integer config parsing' '

@@ -85,8 +85,8 @@ test_expect_success 'negative integer config parsing' '
 test_expect_success '-U0 is valid, so is diff.context=0' '
 	git config diff.context 0 &&
 	git diff >output &&
-	grep "^-ADDED" output &&
-	grep "^+MODIFIED" output
+	test_grep "^-ADDED" output &&
+	test_grep "^+MODIFIED" output
 '
 
 test_expect_success '-U2147483647 works' '

@@ -94,9 +94,9 @@ test_expect_success '-U2147483647 works' '
 	test_line_count = 16 x &&
 	git diff -U2147483647 >output &&
 	test_line_count = 22 output &&
-	grep "^-ADDED" output &&
-	grep "^+MODIFIED" output &&
-	grep "^+APPENDED" output
+	test_grep "^-ADDED" output &&
+	test_grep "^+MODIFIED" output &&
+	test_grep "^+APPENDED" output
 '
 
 test_done

gitgitgadget

From: Leon Michalak <[email protected]>

Use the modern "test_config" test utility instead of manual"git config" as the former provides clean up on test completion.

This is a prerequisite to the commits that follow which add to this test file.

---
 t/t4055-diff-context.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

index c66f966a3ab3..1384a8195705 100755
@@ -47,43 +47,43 @@ test_expect_success 'the default number of context lines is 3' '
 test_expect_success 'diff.context honored by "log"' '
 	git log -1 -p >output &&
 	test_grep ! firstline output &&
-	git config diff.context 8 &&
+	test_config diff.context 8 &&
 	git log -1 -p >output &&
 	test_grep "^ firstline" output
 '
 
 test_expect_success 'The -U option overrides diff.context' '
-	git config diff.context 8 &&
+	test_config diff.context 8 &&
 	git log -U4 -1 >output &&
 	test_grep ! "^ firstline" output
 '
 
 test_expect_success 'diff.context honored by "diff"' '
-	git config diff.context 8 &&
+	test_config diff.context 8 &&
 	git diff >output &&
 	test_grep "^ firstline" output
 '
 
 test_expect_success 'plumbing not affected' '
-	git config diff.context 8 &&
+	test_config diff.context 8 &&
 	git diff-files -p >output &&
 	test_grep ! "^ firstline" output
 '
 
 test_expect_success 'non-integer config parsing' '
-	git config diff.context no &&
+	test_config diff.context no &&
 	test_must_fail git diff 2>output &&
 	test_grep "bad numeric config value" output
 '
 
 test_expect_success 'negative integer config parsing' '
-	git config diff.context -1 &&
+	test_config diff.context -1 &&
 	test_must_fail git diff 2>output &&
 	test_grep "bad config variable" output
 '
 
 test_expect_success '-U0 is valid, so is diff.context=0' '
-	git config diff.context 0 &&
+	test_config diff.context 0 &&
 	git diff >output &&
 	test_grep "^-ADDED" output &&
 	test_grep "^+MODIFIED" output

gitgitgadget

From: Leon Michalak <[email protected]>

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.

This is because the plumbing commands used by "git add -p" to generate the diff do not read those config settings. Fix this by reading the config before generating the patch and passing it along to the diff command with the "-U" and "--inter-hunk-context" command-line options.

---
 add-interactive.c          | 17 +++++++++++++++++
 add-interactive.h          |  1 +
 add-patch.c                |  6 ++++++
 t/t3701-add-interactive.sh | 22 ++++++++++++++++++++++
 4 files changed, 46 insertions(+)

index 97ff35b6f12a..e0aafb8dd02a 100644
@@ -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);

index 693f125e8e4b..c63f35b14be8 100644
@@ -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);

index 95c67d8c80c4..b43ca1600738 100644
@@ -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) {

index b088ee141ff4..18dc329ea1f6 100755
@@ -1230,4 +1230,26 @@ test_expect_success 'hunk splitting works with diff.suppressBlankEmpty' '
 	test_cmp expect actual
 '
 
+test_expect_success 'add -p respects diff.context' '
+	test_write_lines a b c d e f g h i j k l m >file &&
+	git add file &&
+	test_write_lines a b c d e f G h i j k l m >file &&
+	echo y | git -c diff.context=5 add -p >actual &&
+	test_grep "@@ -2,11 +2,11 @@" actual
+'
+
+test_expect_success 'add -p respects diff.interHunkContext' '
+	test_write_lines a b c d e f g h i j k l m n o p q r s >file &&
+	git add file &&
+	test_write_lines a b c d E f g i i j k l m N o p q r s >file &&
+	echo y | git -c diff.interhunkcontext=2 add -p >actual &&
+	test_grep "@@ -2,16 +2,16 @@" actual
+'
+
+test_expect_success 'add -p rejects negative diff.context' '
+	test_config diff.context -1 &&
+	test_must_fail git add -p 2>output &&
+	test_grep "diff.context cannot be negative" output
+'
+
 test_done

gitgitgadget

From: Leon Michalak <[email protected]>

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.

---
 Documentation/diff-context-options.adoc | 10 +++++
 Documentation/git-add.adoc              |  2 +
 Documentation/git-checkout.adoc         |  2 +
 Documentation/git-commit.adoc           |  2 +
 Documentation/git-reset.adoc            |  2 +
 Documentation/git-restore.adoc          |  2 +
 Documentation/git-stash.adoc            |  2 +
 add-interactive.c                       | 36 ++++++++++++----
 add-interactive.h                       | 16 +++++--
 add-patch.c                             |  5 ++-
 builtin/add.c                           | 21 ++++++++--
 builtin/checkout.c                      | 31 ++++++++++++--
 builtin/commit.c                        | 16 ++++++-
 builtin/reset.c                         | 17 +++++++-
 builtin/stash.c                         | 56 ++++++++++++++++++++-----
 commit.h                                |  3 +-
 parse-options.h                         |  2 +
 t/t3701-add-interactive.sh              | 49 ++++++++++++++++++++++
 t/t4055-diff-context.sh                 | 30 +++++++++++++
 t/t9902-completion.sh                   |  2 +
 20 files changed, 271 insertions(+), 35 deletions(-)
 create mode 100644 Documentation/diff-context-options.adoc

new file mode 100644
index 000000000000..e161260358ff
@@ -0,0 +1,10 @@
+`-U<n>`::
+`--unified=<n>`::
+	Generate diffs with _<n>_ lines of context. Defaults to `diff.context`
+	or 3 if the config option is unset.
+
+`--inter-hunk-context=<n>`::
+	Show the context between diff hunks, up to the specified _<number>_
+	of lines, thereby fusing hunks that are close to each other.
+	Defaults to `diff.interHunkContext` or 0 if the config option
+	is unset.

index eba0b419ce50..b7a735824d6c 100644
@@ -104,6 +104,8 @@ This effectively runs `add --interactive`, but bypasses the
 initial command menu and directly jumps to the `patch` subcommand.
 See ``Interactive mode'' for details.
 
+include::diff-context-options.adoc[]
+
 `-e`::
 `--edit`::
 	Open the diff vs. the index in an editor and let the user

index ee83b6d9ba9a..40e02cfd6562 100644
@@ -289,6 +289,8 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
 Note that this option uses the no overlay mode by default (see also
 `--overlay`), and currently doesn't support overlay mode.
 
+include::diff-context-options.adoc[]
+
 `--ignore-other-worktrees`::
 	`git checkout` refuses when the wanted branch is already checked
 	out or otherwise in use by another worktree. This option makes

index dc219025f1eb..ae988a883b5b 100644
@@ -76,6 +76,8 @@ OPTIONS
 	which changes to commit. See linkgit:git-add[1] for
 	details.
 
+include::diff-context-options.adoc[]
+
 `-C <commit>`::
 `--reuse-message=<commit>`::
 	Take an existing _<commit>_ object, and reuse the log message

index 53ab88c5451c..50e8a0ba6f66 100644
@@ -125,6 +125,8 @@ OPTIONS
 	separated with _NUL_ character and all other characters are taken
 	literally (including newlines and quotes).
 
+include::diff-context-options.adoc[]
+
 `--`::
 	Do not interpret any more arguments as options.
 

index 877b7772e667..1dcc2bb7aea3 100644
@@ -52,6 +52,8 @@ leave out at most one of _<rev-A>__ and _<rev-B>_, in which case it defaults to
 	Mode" section of linkgit:git-add[1] to learn how to operate
 	the `--patch` mode.
 
+include::diff-context-options.adoc[]
+
 `-W`::
 `--worktree`::
 `-S`::

index 1a5177f4986c..0578c619c410 100644
@@ -208,6 +208,8 @@ to learn how to operate the `--patch` mode.
 The `--patch` option implies `--keep-index`.  You can use
 `--no-keep-index` to override this.
 
+include::diff-context-options.adoc[]
+
 -S::
 --staged::
 	This option is only valid for `push` and `save` commands.

index e0aafb8dd02a..c343568bf7ec 100644
@@ -36,7 +36,8 @@ static void init_color(struct repository *r, struct add_i_state *s,
 	free(key);
 }
 
-void init_add_i_state(struct add_i_state *s, struct repository *r)
+void init_add_i_state(struct add_i_state *s, struct repository *r,
+		      struct add_p_opt *add_p_opt)
 {
 	const char *value;
 	int context;

@@ -98,6 +99,17 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
 	repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);
 	if (s->use_single_key)
 		setbuf(stdin, NULL);
+
+	if (add_p_opt->context != -1) {
+		if (add_p_opt->context < 0)
+			die(_("%s cannot be negative"), "--unified");
+		s->context = add_p_opt->context;
+	}
+	if (add_p_opt->interhunkcontext != -1) {
+		if (add_p_opt->interhunkcontext < 0)
+			die(_("%s cannot be negative"), "--inter-hunk-context");
+		s->interhunkcontext = add_p_opt->interhunkcontext;
+	}
 }
 
 void clear_add_i_state(struct add_i_state *s)

@@ -986,6 +998,10 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
 	opts->prompt = N_("Patch update");
 	count = list_and_choose(s, files, opts);
 	if (count > 0) {
+		struct add_p_opt add_p_opt = {
+			.context = s->context,
+			.interhunkcontext = s->interhunkcontext,
+		};
 		struct strvec args = STRVEC_INIT;
 		struct pathspec ps_selected = { 0 };
 

@@ -996,7 +1012,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
 		parse_pathspec(&ps_selected,
 			       PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
 			       PATHSPEC_LITERAL_PATH, "", args.v);
-		res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected);
+		res = run_add_p(s->r, ADD_P_ADD, &add_p_opt, NULL, &ps_selected);
 		strvec_clear(&args);
 		clear_pathspec(&ps_selected);
 	}

@@ -1031,10 +1047,13 @@ static int run_diff(struct add_i_state *s, const struct pathspec *ps,
 	if (count > 0) {
 		struct child_process cmd = CHILD_PROCESS_INIT;
 
-		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached",
-			     oid_to_hex(!is_initial ? &oid :
-					s->r->hash_algo->empty_tree),
-			     "--", NULL);
+		strvec_pushl(&cmd.args, "git", "diff", "-p", "--cached", NULL);
+		if (s->context != -1)
+			strvec_pushf(&cmd.args, "--unified=%i", s->context);
+		if (s->interhunkcontext != -1)
+			strvec_pushf(&cmd.args, "--inter-hunk-context=%i", s->interhunkcontext);
+		strvec_pushl(&cmd.args, oid_to_hex(!is_initial ? &oid :
+			     s->r->hash_algo->empty_tree), "--", NULL);
 		for (i = 0; i < files->items.nr; i++)
 			if (files->selected[i])
 				strvec_push(&cmd.args,

@@ -1127,7 +1146,8 @@ static void command_prompt_help(struct add_i_state *s)
 			 _("(empty) select nothing"));
 }
 
-int run_add_i(struct repository *r, const struct pathspec *ps)
+int run_add_i(struct repository *r, const struct pathspec *ps,
+	      struct add_p_opt *add_p_opt)
 {
 	struct add_i_state s = { NULL };
 	struct print_command_item_data data = { "[", "]" };

@@ -1170,7 +1190,7 @@ int run_add_i(struct repository *r, const struct pathspec *ps)
 			->util = util;
 	}
 
-	init_add_i_state(&s, r);
+	init_add_i_state(&s, r, add_p_opt);
 
 	/*
 	 * When color was asked for, use the prompt color for

index c63f35b14be8..4213dcd67b9a 100644
@@ -3,6 +3,13 @@
 
 #include "color.h"
 
+struct add_p_opt {
+	int context;
+	int interhunkcontext;
+};
+
+#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1 }
+
 struct add_i_state {
 	struct repository *r;
 	int use_color;

@@ -21,12 +28,14 @@ struct add_i_state {
 	int context, interhunkcontext;
 };
 
-void init_add_i_state(struct add_i_state *s, struct repository *r);
+void init_add_i_state(struct add_i_state *s, struct repository *r,
+		      struct add_p_opt *add_p_opt);
 void clear_add_i_state(struct add_i_state *s);
 
 struct repository;
 struct pathspec;
-int run_add_i(struct repository *r, const struct pathspec *ps);
+int run_add_i(struct repository *r, const struct pathspec *ps,
+	      struct add_p_opt *add_p_opt);
 
 enum add_p_mode {
 	ADD_P_ADD,

@@ -37,6 +46,7 @@ enum add_p_mode {
 };
 
 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);
 
 #endif