Re: Files modified, even after: git reset --hard

From: Philip Oakley <philipoakley@iee.email>
Date: Jul 26, 2021, 18:21 UTC
Message-ID: <67a3c7d0-a199-da8d-09f5-1ff25c0d24ae@iee.email>
In-Reply-To: <5ca837f6-44dd-2b43-32dc-e1e134d18d61@mfriebe.de>

On 26/07/2021 14:57, Martin wrote:

Show 50 quoted lines

> On 26/07/2021 12:31, Martin wrote:
>> On 26/07/2021 04:59, Chris Torek wrote:
>>> On Sun, Jul 25, 2021 at 6:34 PM Martin <git@mfriebe.de> wrote:
>>>> Actually there is something else.
>>>>
>>>> If a file has line-endings that will change, then
>>>>      git add --renormalize .
>>>>      git commit -m foo
>>>> will commit those files.
>>>>
>>>> But I am now also getting files, that show modified, but that can
>>>> not be
>>>> committed renormalized (0 lines changed).
>>>
>>> I believe (but can't demonstrate) that this is a temporary condition.
>>
>> I now found one, that does not seem temporary at all...
>>
>> git remote -v
>> origin  git://sourceware.org/git/binutils-gdb.git (fetch)
>> origin  git://sourceware.org/git/binutils-gdb.git (push)
>>
>> Switching to a far away commit
>> git switch -f --detach master
>> git rev-list master | wc -l
>> 93917
>>
>> git status shows no modified files
>>
>>
>> Then switching to  (this is on master branch)
>> git switch -f --detach a362ee23634
>> git rev-list a362ee23634 | wc -l
>> 4164
>>
>> git status --porcelain=v2
>> 1 .M N... 100644 100644 100644
>> 9e677a52ae690808165993a0f3f17ac49e3969df
>> 9e677a52ae690808165993a0f3f17ac49e3969df bfd/Makefile.dos
>> 1 .M N... 100644 100644 100644
>> ff24f19c0b6e0c7fb713c79e8f1765bc22fe7adc
>> ff24f19c0b6e0c7fb713c79e8f1765bc22fe7adc binutils/Makefile.dos
>> 1 .M N... 100644 100644 100644
>> 1d9541c2f896842d1bafe68ccf0a51e291d66688
>> 1d9541c2f896842d1bafe68ccf0a51e291d66688 gas/Makefile.dos
>> 1 .M N... 100644 100644 100644
>> 57fab985680ea151379069abe414bcb590cdd743
>> 57fab985680ea151379069abe414bcb590cdd743 ld/Makefile.dos
>
> This seems an issue with gitforwindows.

I doubt that it is Git-for-Windows (the .exe), but could easily believe that the whole scenario is predicated on the Windows line endings and personal .gitconfigs (some of which may be GfW norms) and the repository's upstream norms (such as what is committed in the repo).

Given the repos/remotes listed your email in https://public-inbox.org/git/f454bf5b-c5ff-4140-02a8-b02dcd35c6b9@mfriebe.de/, What are all your differing configs between Windows & Linux testing and their location (i.e. use ` git config --list --show-origin --show-scope`).

The comparison you suggest, I believe, is between master:1b348b6b67dcdc120f5ac9dc409142b8ec2b4a09 (17 Apr 2021) and the detached https://github.com/User4martin/binutils-gdb/commit/a362ee23634 "recording file death" (8 Dec 1992) (is that the commit you really wanted to detach and compare with?)

The Github compare wasn't helpful as there are too many changes [https://github.com/red-prig/binutils-gdb/compare/1b348b6..a362ee23634]

Just thinking about an MVCE.

Show 11 quoted lines

>
> I checked on 2 linux distros (git 2.25 and 2.31.1) and both are fine.
>
> On Windows I set
> core.autocrlf false
> core.fscache false
>
> Made a new clone, some (applied config as above), issue still present.
>
> Tested with gitforwindow 2.32, 2.31.1 and 2.30.2
>

Philip