summaryrefslogtreecommitdiff
path: root/add-patch.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-09-07 04:08:53 -0400
committerJunio C Hamano <gitster@pobox.com>2020-09-08 14:48:29 -0700
commitdc6264157236fb729ad072e18f14d89549c08555 (patch)
treee071f5d9bd0ca3092cbf7d3b1284c7e5d4e18698 /add-patch.c
parent47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc (diff)
downloadgit-dc6264157236fb729ad072e18f14d89549c08555.tar.gz
add-patch: fix inverted return code of repo_read_index()
After applying hunks to a file with "add -p", the C patch_update_file() function tries to refresh the index (just like the perl version does). We can only refresh the index if we're able to read it in, so we first check the return value of repo_read_index(). But unlike many functions, where "0" is success, that function is documented to return the number of entries in the index. Hence we should be checking for success with a non-negative return value. Neither the tests nor any users seem to have noticed this, probably due to a combination of: - this affects only the C version, which is not yet the default - following it up with any porcelain command like "git diff" or "git commit" would refresh the index automatically. But you can see the problem by running the plumbing "git diff-files" immediately after "add -p" stages all hunks. Running the new test with GIT_TEST_ADD_I_USE_BUILTIN=1 fails without the matching code change. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'add-patch.c')
-rw-r--r--add-patch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/add-patch.c b/add-patch.c
index f899389e2c..e6fa10715d 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -1624,7 +1624,7 @@ soft_increment:
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);
}