On Tue, Jul 18, 2017 at 3:44 PM, Stefan Beller <sbel...@google.com> wrote:
> On Tue, Jul 18, 2017 at 3:32 PM, Junio C Hamano <gits...@pobox.com> wrote:
>> Stefan Beller <sbel...@google.com> writes:
>>
>>>> + if (!lstat(list_item->name, &st) && !ce_match_stat(list_item, &st,
>>>> 0)) {
>>>> + print_status(info, ' ', list_item->name, sub_sha1,
>>>> displaypath);
>>>
>>> The question from the last round still stands
>>> https://public-inbox.org/git/cagz79kb18z5zc9iu3vv5avzwjmozzmwbmvpy89vc-t-ei2m...@mail.gmail.com/
>>>
>>> I am not an expert in the diff area and wonder how
>>> the cmd_diff_files functionality is achieved with just a stat call
>>> and then comparing it to ce_match_stat. 'Using "dirty" ignores
>>> all changes to the work tree of submodules, only changes to the
>>> commits stored in the superproject are shown.' So I'd have
>>> expected ce->oid to be compared (is there an index entry differing,
>>> i.e. more than one stage?)
>>
>> ce_match_stat() calls into ce_compare_gitlink() for a 160000 entry,
>> which would resolve HEAD ref there and compares ce->oid with it.
>
> Oh in that case this should be fine, as in the original we did
> "git diff-files --ignore-submodules=dirty <path>",
> which did precisely that.
Are you sure that this will work correctly when ce is unmerged?
run_diff_files() has quite a lot of code for that case.
