We have been tolerating errors by returning early with an error that
the caller ignores since rerere.autoupdate was introduced in
v1.6.0-rc0~120^2 (2008-06-22). So on error (for example if the index
is already locked), rerere can return success without updating the
index or with only some items in the index updated.
Better to treat such failures as a fatal error so the operator can
figure out what is wrong and fix it.
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@xxxxxxxxx> writes:
>> for (i = 0; i < update->nr; i++) {
>> struct string_list_item *item = &update->items[i];
>> if (add_file_to_cache(item->string, ADD_CACHE_IGNORE_ERRORS))
>> - status = -1;
>> + die("staging updated %s failed", item->string);
>
> Instead of crafting a new message, why not just stop passing IGNORE_ERRORS
> and have add_file_to_cache() report the failure? That is:
>
> if (add_file_to_cache(item->string, 0))
> return -1;
Good catch. It turns out that add_file_to_index does not even pay
attention to the IGNORE_ERRORS flag. On error it unconditionally
prints a message using 'return error()'.
builtin/add.c uses the IGNORE_ERRORS to flag to decide whether to
avoid die()-ing on error (and it still lets add_file_to_index print the
error to stderr in that case, so --ignore-errors is a bit of a misnomer).
if (add_file_to_cache(dir->entries[i]->name, flags)) {
if (!ignore_add_errors)
die(_("adding files failed"));
exit_status = 1;
}
The message always says which file it failed to index, so I agree that
it makes sense to simply exit(128) here.
rerere.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/rerere.c b/rerere.c
index 1b0555f..dbb2545 100644
--- a/rerere.c
+++ b/rerere.c
@@ -477,27 +477,26 @@ out:
static struct lock_file index_lock;
-static int update_paths(struct string_list *update)
+static void update_paths(struct string_list *update)
{
int i;
- int fd = hold_locked_index(&index_lock, 0);
- int status = 0;
- if (fd < 0)
- return -1;
+ hold_locked_index(&index_lock, 1);
for (i = 0; i < update->nr; i++) {
- struct string_list_item *item = &update->items[i];
- if (add_file_to_cache(item->string, ADD_CACHE_IGNORE_ERRORS))
- status = -1;
+ if (add_file_to_cache(update->items[i].string, 0))
+ /*
+ * add_file_to_cache() printed an error
+ * with the pathname, so we don't have to.
+ */
+ exit(128);
}
- if (!status && active_cache_changed) {
+ if (active_cache_changed) {
if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
die("Unable to write new index file");
- } else if (fd >= 0)
+ } else
rollback_lock_file(&index_lock);
- return status;
}
static int do_plain_rerere(struct string_list *rr, int fd)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html