From d3ac7398dbff429580f478a8e6419f08ddcc3ead Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 8 Mar 2019 15:58:27 +0100
Subject: [PATCH] built-in add -i: re-implement the `diff` command

It is not only laziness that we simply spawn `git diff -p --cached`
here: this command needs to use the pager, and the pager needs to exit
when the diff is done. Currently we do not have any way to make that
happen if we run the diff in-process. So let's just spawn.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 add-interactive.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/add-interactive.c b/add-interactive.c
index 2783247389..639e2b1149 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -852,6 +852,51 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
 	return res;
 }
 
+static int run_diff(struct add_i_state *s, const struct pathspec *ps,
+		    struct file_list *files,
+		    struct list_and_choose_options *opts)
+{
+	struct prefix_item **items = (struct prefix_item **)files->file;
+	int res = 0, *selected = NULL;
+	ssize_t count, i;
+
+	struct object_id oid;
+	int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid,
+					     NULL);
+	reset_file_list(files);
+	if (get_modified_files(s->r, INDEX_ONLY, NULL, NULL, files, ps) < 0)
+		return -1;
+
+	if (!files->nr) {
+		putchar('\n');
+		return 0;
+	}
+
+	opts->prompt = N_("Review diff");
+	CALLOC_ARRAY(selected, files->nr);
+
+	opts->flags = IMMEDIATE;
+	count = list_and_choose(items, selected, files->nr, s, opts);
+	opts->flags = 0;
+	if (count >= 0) {
+		struct argv_array args = ARGV_ARRAY_INIT;
+
+		argv_array_pushl(&args, "git", "diff", "-p", "--cached",
+				 oid_to_hex(!is_initial ? &oid :
+					    s->r->hash_algo->empty_tree),
+				 "--", NULL);
+		for (i = 0; i < files->nr; i++)
+			if (selected[i])
+				argv_array_push(&args, items[i]->name);
+		res = run_command_v_opt(args.argv, 0);
+		argv_array_clear(&args);
+	}
+
+	putchar('\n');
+	free(selected);
+	return res;
+}
+
 static int run_help(struct add_i_state *s, const struct pathspec *ps,
 		    struct file_list *files,
 		    struct list_and_choose_options *opts)
@@ -946,10 +991,11 @@ int run_add_i(struct repository *r, const struct pathspec *ps)
 		revert = { { "revert" }, run_revert },
 		add_untracked = { { "add untracked" }, run_add_untracked },
 		patch = { { "patch" }, run_patch },
+		diff = { { "diff" }, run_diff },
 		help = { { "help" }, run_help };
 	struct command_item *commands[] = {
 		&status, &update, &revert, &add_untracked,
-		&patch, &help
+		&patch, &diff, &help
 	};
 
 	struct print_file_item_data print_file_item_data = {