By switching to repo_read_index_or_die, we'll get a slightly different
error message ("index file corrupt") as well as localization of it.
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
---
rerere.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/rerere.c b/rerere.c
index 18cae2d11c9..5f35dd66f90 100644
--- a/rerere.c
+++ b/rerere.c
@@ -10,6 +10,7 @@
#include "attr.h"
#include "pathspec.h"
#include "sha1-lookup.h"
+#include "repository.h"
#define RESOLVED 0
#define PUNTED 1
@@ -567,8 +568,7 @@ static int check_one_conflict(int i, int *type)
static int find_conflict(struct string_list *conflict)
{
int i;
- if (read_cache() < 0)
- return error("Could not read index");
+ repo_read_index_or_die(the_repository);
for (i = 0; i < active_nr;) {
int conflict_type;
@@ -600,8 +600,7 @@ int rerere_remaining(struct string_list *merge_rr)
int i;
if (setup_rerere(merge_rr, RERERE_READONLY))
return 0;
- if (read_cache() < 0)
- return error("Could not read index");
+ repo_read_index_or_die(the_repository);
for (i = 0; i < active_nr;) {
int conflict_type;
@@ -1103,8 +1102,7 @@ int rerere_forget(struct pathspec *pathspec)
struct string_list conflict = STRING_LIST_INIT_DUP;
struct string_list merge_rr = STRING_LIST_INIT_DUP;
- if (read_cache() < 0)
- return error("Could not read index");
+ repo_read_index_or_die(the_repository);
fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
if (fd < 0)
--
2.17.0.582.gccdcbd54c44.dirty
