Re: [PATCH] add --interactive: allow `update` to stage deleted files
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 28, 2022, 22:35 UTC
- Message-ID
- <xmqqr138h0wn.fsf@gitster.g>
- In-Reply-To
- <pull.1273.git.1656454964378.gitgitgadget@gmail.com>
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 23 quoted lines
> diff --git a/add-interactive.c b/add-interactive.c
> index 6047e8f6489..22fcd3412ca 100644
> --- a/add-interactive.c
> +++ b/add-interactive.c
> @@ -697,8 +697,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;
> }The fix looks quite straight-forward. It is somewhat disappointing that it was caught after this loooong time, but as they say, better late than never.
Thanks for a quick report and a fix.
Show 22 quoted lines
> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh > index fc26cb8bae8..b354fb39de8 100755 > --- a/t/t3701-add-interactive.sh > +++ b/t/t3701-add-interactive.sh > @@ -103,6 +103,15 @@ test_expect_success 'status works (commit)' ' > grep "+1/-0 *+2/-0 file" output > ' > > +test_expect_success 'update can stage deletions' ' > + >to-delete && > + git add to-delete && > + rm to-delete && > + test_write_lines u t "" | git add -i && > + git ls-files to-delete >output && > + test_must_be_empty output > +' > + > test_expect_success 'setup expected' ' > cat >expected <<-\EOF > index 180b47c..b6f2c08 100644 > > base-commit: e4a4b31577c7419497ac30cebe30d755b97752c5