Re: [GSoC][RFC] discussion about stashing with conflicts

From: Kapil Jain <jkapil.cs@gmail.com>
Date: Apr 8, 2019, 11:00 UTC
Message-ID: <CAMknYENqH==YcAfU-B16Jytc4Pts4viNQn9deTFag++zZVb1+Q@mail.gmail.com>
In-Reply-To: <CACsJy8Dc3fuXWOOO-hNJqGNomufP7bffoHVf5hHLTubHQvq9vA@mail.gmail.com>

On Mon, Apr 8, 2019 at 4:02 PM Duy Nguyen <pclouds@gmail.com> wrote:

Show 6 quoted lines

>
> Sometimes when I don't understand what some code does, I look at "git
> log --patch". In this case, there a big explanation in ad3762042a
> (read-cache: fix directory/file conflict handling in
> read_index_unmerged(), 2018-07-31) that might help you.
>

i got my reason from the commit message,

"The _only_ reason we want to keep a previously unmerged entry in the index at stage #0 is so that we don't forget the fact that we have corresponding file in the work tree in order to be able to remove it when the tree we are resetting to does not have the path."

and now that i got back to reading that comment, it makes sense.

for finding that commit message did you do something like this: git log -L :repo_read_index_unmerged:read-cache.c

Thanks.