Merge branch 'jk/add-i-fixes'

gitster · gitster · commit 694e51777824 · 2020-09-18T17:58:04.000-07:00
"add -i/-p" fixes.

* jk/add-i-fixes:
  add--interactive.perl: specify --no-color explicitly
  add-patch: fix inverted return code of repo_read_index()
diff --git a/add-patch.c b/add-patch.c
@@ -1655,7 +1655,7 @@ static int patch_update_file(struct add_p_state *s,
 					 NULL, 0, NULL, 0))
 				error(_("'git apply' failed"));
 		}
-		if (!repo_read_index(s->s.r))
+		if (repo_read_index(s->s.r) >= 0)
 			repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0,
 						     1, NULL, NULL, NULL);
 	}
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
@@ -714,7 +714,7 @@ sub parse_diff {
 	if (defined $patch_mode_revision) {
 		push @diff_cmd, get_diff_reference($patch_mode_revision);
 	}
-	my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path);
+	my @diff = run_cmd_pipe("git", @diff_cmd, qw(--no-color --), $path);
 	my @colored = ();
 	if ($diff_use_color) {
 		my @display_cmd = ("git", @diff_cmd, qw(--color --), $path);
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
@@ -569,12 +569,20 @@ test_expect_success 'patch mode ignores unmerged entries' '
 	diff_cmp expected diff
 '
 
+test_expect_success 'index is refreshed after applying patch' '
+	git reset --hard &&
+	echo content >test &&
+	printf y | git add -p &&
+	git diff-files --exit-code
+'
+
 test_expect_success 'diffs can be colorized' '
 	git reset --hard &&
 
 	echo content >test &&
 	printf y >y &&
 	force_color git add -p >output 2>&1 <y &&
+	git diff-files --exit-code &&
 
 	# 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.

Original file line number	Diff line number	Diff line change
`@@ -1655,7 +1655,7 @@ static int patch_update_file(struct add_p_state *s,`
`1655`	`1655`	`NULL, 0, NULL, 0))`
`1656`	`1656`	`error(_("'git apply' failed"));`
`1657`	`1657`	`}`
`1658`		`- if (!repo_read_index(s->s.r))`
	`1658`	`+ if (repo_read_index(s->s.r) >= 0)`
`1659`	`1659`	`repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0,`
`1660`	`1660`	`1, NULL, NULL, NULL);`
`1661`	`1661`	`}`
Original file line number	Diff line number	Diff line change
`@@ -714,7 +714,7 @@ sub parse_diff {`
`714`	`714`	`if (defined $patch_mode_revision) {`
`715`	`715`	`push @diff_cmd, get_diff_reference($patch_mode_revision);`
`716`	`716`	`}`
`717`		`- my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path);`
	`717`	`+ my @diff = run_cmd_pipe("git", @diff_cmd, qw(--no-color --), $path);`
`718`	`718`	`my @colored = ();`
`719`	`719`	`if ($diff_use_color) {`
`720`	`720`	`my @display_cmd = ("git", @diff_cmd, qw(--color --), $path);`