built-in add -i: do not try to `patch`/`diff` an empty list of files
When the user does not select any files to `patch` or `diff`, there is no need to call `run_add_p()` on them. Even worse: we _have_ to avoid calling `parse_pathspec()` with an empty list because that would trigger this error: BUG: pathspec.c:557: PATHSPEC_PREFER_CWD requires arguments So let's avoid doing any work on a list of files that is empty anyway. This fixes https://github.com/git-for-windows/git/issues/2466. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 16, 2020 at 08:33 UTC
d660a30ceb9d8bd9940be82d240901c87999186b
1 file changed
+2
-2
add-interactive.c
+2
-2
@@ -915,7 +915,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
915
916
opts->prompt = N_("Patch update");
917
count = list_and_choose(s, files, opts);
918
- if (count >= 0) {
918
+ if (count > 0) {
919
struct argv_array args = ARGV_ARRAY_INIT;
920
921
argv_array_pushl(&args, "git", "add--interactive", "--patch",
@@ -953,7 +953,7 @@ static int run_diff(struct add_i_state *s, const struct pathspec *ps,
953
opts->flags = IMMEDIATE;
954
count = list_and_choose(s, files, opts);
955
opts->flags = 0;
956
- if (count >= 0) {
956
+ if (count > 0) {
957
struct argv_array args = ARGV_ARRAY_INIT;
958
959
argv_array_pushl(&args, "git", "diff", "-p", "--cached",