Re: [PATCH v2 0/6] stash: drop usage of a second index

From: Christian Couder <christian.couder@gmail.com>
Date: Jul 31, 2020, 13:53 UTC
Message-ID: <CAP8UFD3ywqAG4qtc8mYUOE_DMN8HhpE1nZO=9cBYkt0kHZ+83A@mail.gmail.com>
In-Reply-To: <20200630151558.20975-1-alban.gruin@gmail.com>

On Tue, Jun 30, 2020 at 5:16 PM Alban Gruin <alban.gruin@gmail.com> wrote:

Show 9 quoted lines

>
> The old scripted `git stash' used to create a second index to save
> modified and untracked files, and restore untracked files, without
> affecting the main index.  This behaviour was carried on when it was
> rewritten in C, and here, most operations performed on the second index
> are done by forked commands (ie. `read-tree' instead of reset_tree(),
> etc.).
>
> The goal of this series is to modernise (a bit) builtin/stash.c.

This patch series looks good to me. I found only a small nit or typo in the commit message of patch 5/6.

Show 6 quoted lines

> Originally, this series was also meant to fix a bug reported by Son
> Luong Ngoc [0], but as emphasized by Gábor [1], the issue is not limited
> to `git stash', so this series is not a good fix for this particular
> issue.
>
> This series is based on a08a83db2b (The sixth batch, 2020-06-29).

It seems to apply without conflicts on top of current master.

Show 6 quoted lines

> Changes since v1:
>
>  - Lots of rewording, following comments from Christian Couder and Son
>    Luong Ngoc.
>
>  - Removed a useless function call.

[...]

>  builtin/stash.c | 156 +++++++++++++++---------------------------------
>  1 file changed, 48 insertions(+), 108 deletions(-)

I like very much how it simplifies a lot of things.

Thanks, Christian.