Re: diff --diff-filter on modified but locally deleted files

From: Robert Dailey <rcdailey.lists@gmail.com>
Date: Aug 17, 2016, 18:47 UTC
Message-ID: <CAHd499AP9VnQ8cVioc5aPQ7qUPdV=i70o58OW1Sh6uYOMf1W7Q@mail.gmail.com>
In-Reply-To: <xmqq8tvv9rcd.fsf@gitster.mtv.corp.google.com>

On Wed, Aug 17, 2016 at 1:34 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 18 quoted lines

> Robert Dailey <rcdailey.lists@gmail.com> writes:
>
>> My use case is that I do a merge from branch A to branch B. Branch A
>> modified a file which is already deleted on B some time before the
>> merge.
>>
>> When I do a `git status -sb`, these locally deleted but remotely
>> modified files show up as "DU".
>>
>> I want to invoke git status or diff (or something else) to get a list
>> of these specific conflicts (locally deleted, remotely modified).
>
> As far as "git diff [--cached]" (which is "compare HEAD with the
> working tree through index") is concerned, these paths are in the
> "U"nmerged category, so you'd give "U" to diff-filter to view them.
> Of course, that would give you other kinds of unmerged entries.
>
> If you know they show up as DU, why not "grep DU" in that output?

I'm happy to do that and in fact considered it, but since --diff-filter exists, I figured it might solve the problem. I also need a better understanding of how diff-filter works since it technically has 2 sides during a merge conflict. I guess it functions only on the right (local) side.

Thanks Junio.