From 4788e8b25692a8ae1a005554d3ad12f8ee4ee29e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 28 Jun 2022 22:22:44 +0000 Subject: add --interactive: allow `update` to stage deleted files The scripted version of `git add -i` used `git update-index --add --remove`, but the built-in version implemented only the `--add` part. This fixes https://github.com/msys2/MSYS2-packages/issues/3066 Reported-by: Christoph Reiter Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- add-interactive.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'add-interactive.c') diff --git a/add-interactive.c b/add-interactive.c index f395d54c08..63bc1c1d67 100644 --- a/add-interactive.c +++ b/add-interactive.c @@ -665,8 +665,16 @@ static int run_update(struct add_i_state *s, const struct pathspec *ps, for (i = 0; i < files->items.nr; i++) { const char *name = files->items.items[i].string; - if (files->selected[i] && - add_file_to_index(s->r->index, name, 0) < 0) { + struct stat st; + + if (!files->selected[i]) + continue; + if (lstat(name, &st) && is_missing_file_error(errno)) { + if (remove_file_from_index(s->r->index, name) < 0) { + res = error(_("could not stage '%s'"), name); + break; + } + } else if (add_file_to_index(s->r->index, name, 0) < 0) { res = error(_("could not stage '%s'"), name); break; } -- cgit v1.2.3