[RFC/PATCH 1/7] rerere: unify error message when read_cache fails
- From
Thomas Gummerer <t.gummerer@gmail.com>
- Date
- May 20, 2018, 21:12 UTC
- Message-ID
- <20180520211210.1248-2-t.gummerer@gmail.com>
- In-Reply-To
- <20180520211210.1248-1-t.gummerer@gmail.com>
We have multiple different variants of the error message we show to the user if 'read_cache' fails. The "Could not read index" variant we are using in 'rerere.c' is currently not used anywhere in translated form.
As a subsequent commit will mark all output that comes from 'rerere.c' for translation, make the life of the translators a little bit easier by using a string that is used elsewhere, and marked for translation there, and thus most likely already translated.
"index file corrupt" seems to be the most common error message we show when 'read_cache' fails, so use that here as well.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> ---
"index file corrupt" is also what Stefan chose for his series unifying these error messages (and 'die'ing, which I'm not sure is the right thing to do here as also mentioned in my reply to [1]). I'm happy to drop this if we decide to go with that series.
[1]: <20180516222118.233868-8-sbeller@google.com>
rerere.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rerere.c b/rerere.c index 18cae2d11c..4b4869662d 100644 --- a/rerere.c +++ b/rerere.c @@ -568,7 +568,7 @@ static int find_conflict(struct string_list *conflict) { int i; if (read_cache() < 0) - return error("Could not read index"); + return error("index file corrupt"); for (i = 0; i < active_nr;) { int conflict_type; @@ -601,7 +601,7 @@ int rerere_remaining(struct string_list *merge_rr) if (setup_rerere(merge_rr, RERERE_READONLY)) return 0; if (read_cache() < 0) - return error("Could not read index"); + return error("index file corrupt"); for (i = 0; i < active_nr;) { int conflict_type; @@ -1104,7 +1104,7 @@ int rerere_forget(struct pathspec *pathspec) struct string_list merge_rr = STRING_LIST_INIT_DUP; if (read_cache() < 0) - return error("Could not read index"); + return error("index file corrupt"); fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE); if (fd < 0)
-- 2.17.0.588.g4d217cdf8e.dirty