git diff strange warning for gitattributes when diff file in subfolder #255

toninlg · 2015-07-24T15:45:23Z

Hi,
I've a repository with four subfolders in it and .gitattributes at the root.
When using the following command:

git diff adb8ff70694379ee2d339ef94900b602fa62593c:folder/file.c..cae5dc93450f6d604debfbe832790f0c2968ce48:folder/file.c

The diff is shown but the following warnings are shown at the end:

warning: unable to access 'adb8ff70694379ee2d339ef94900b602fa62593c:folder/.gitattributes': Invalid argument
warning: unable to access 'adb8ff70694379ee2d339ef94900b602fa62593c:folder/file.c..cae5dc93450f6d604debfbe832790f0c2968ce48:folder/.gitattributes': Invalid argument
warning: unable to access 'cae5dc93450f6d604debfbe832790f0c2968ce48:folder/.gitattributes': Invalid argument

version is Git for Windows 2.3.5 release 8.
I've cloned the repository to linux with git version 2.4.6, no warnings are displayed.
I've installed the last version Git-2.4.6-5th on another computer without doing any specific git config, cloned the repository and same warnings are displayed.

I've no warning on Windows when doing:

git diff adb8ff70694379ee2d339ef94900b602fa62593c:.gitignore..cae5dc93450f6d604debfbe832790f0c2968ce48:.gitignore

Thank you.

The text was updated successfully, but these errors were encountered:

toninlg · 2015-07-24T19:17:41Z

It can be reproduced with a repository with 3 commits:

1st commit:
.gitattributes file at git root folder with some lines
2nd commit:
folder/file.txt with some lines
3rd commit:
add some lines in folder/file.txt

then:
git diff sha1_commit2:folder/file.txt sha1_commit3:folder/file.txt

in this case, I've only two warnings:

sha1_commit2:folder/.gitattributes
sha1_commit3:folder/.gitattributes

dscho · 2015-08-07T14:38:57Z

@toninlg can you please provide a complete verifiable example? I.e. something like a repository that only needs to be cloned and a script inside that needs to be run to demonstrate the bug?

toninlg · 2015-08-09T11:11:45Z

@dscho You can clone https://github.com/toninlg/gitattributes_warning.git

and run the script diff.sh at the root of the repository

dscho · 2015-08-12T15:07:28Z

I can confirm with the MCVE that this is a Windows-only bug.

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes git-for-windows#255. Signed-off-by: Johannes Schindelin <[email protected]>

dscho · 2015-08-13T15:37:34Z

@toninlg please test #276.

dscho · 2015-08-14T15:20:06Z

@toninlg please test #276.

toninlg · 2015-08-14T22:09:29Z

Sorry for the time to reply.
I have tested #276 on top of last commit on master and I can confirm that it solves the problem.

Thank you.

dscho · 2015-08-15T08:15:03Z

I have tested #276 on top of last commit on master and I can confirm that it solves the problem.

Perfect! Thanks for testing!

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes git-for-windows#255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes #255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes git-for-windows#255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes #255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes git-for-windows#255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes #255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes git-for-windows#255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes #255. Signed-off-by: Johannes Schindelin <[email protected]>

This problem has been reported originally in August 2015, as git-for-windows#255 The symptom: when passing <commit>:<directory>/<file> style arguments to `git diff`, Git tries to read the attributes from a file called <commit>:<directory>/.gitattributes. This symptom is more prominent on Windows because the colon in the file name is illegal, and therefore reported to the user. On Linux, the colon is legal, and it just so happens that that file typically does not exist, and therefore there are no adverse consequences. However, it is still a bug: Git should not even attempt to open that file. Let's add a test case to demonstrate that problem, even on Linux and MacOSX. The underlying problem will be really tricky to fix: the run_diff*() family of functions expects the path passed via the diff_filespec structs to be the path as if it were in the worktree. However, when processing the `git diff <blob1> <blob2>` invocation, Git uses setup_revisions()'s parsing of the pending objects to fill in this information, and setup_revisions() simply copies the command-line argument, rather than reconstructing the actual *file* path. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes the symptom reported in git-for-windows#255 Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes #255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes git-for-windows#255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes #255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes git-for-windows#255. Signed-off-by: Johannes Schindelin <[email protected]>

On Windows, a file name containing a colon is illegal. We should therefore expect the corresponding errno when `fopen()` is called for a path of the form <commit>:.gitattributes. This fixes #255. Signed-off-by: Johannes Schindelin <[email protected]>

…ire-time option This will need a change in microsoft/scalar and microsoft/vfsforgit to handle the correct input. It has _never worked_.

dscho added the mcve-required label Aug 7, 2015

dscho added bug git and removed mcve-required labels Aug 12, 2015

dscho self-assigned this Aug 12, 2015

dscho mentioned this issue Aug 13, 2015

mingw: Suppress warning that <commit>:.gitattributes does not exist #276

Merged

toninlg closed this as completed Aug 14, 2015

stepro mentioned this issue Aug 30, 2019

[2.23.0] bash: /dev/fd/62: No such file or directory #2291

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

git diff strange warning for gitattributes when diff file in subfolder #255

git diff strange warning for gitattributes when diff file in subfolder #255

toninlg commented Jul 24, 2015

toninlg commented Jul 24, 2015

dscho commented Aug 7, 2015

toninlg commented Aug 9, 2015

dscho commented Aug 12, 2015

dscho commented Aug 13, 2015

dscho commented Aug 14, 2015

toninlg commented Aug 14, 2015

dscho commented Aug 15, 2015

git diff strange warning for gitattributes when diff file in subfolder #255

git diff strange warning for gitattributes when diff file in subfolder #255

Comments

toninlg commented Jul 24, 2015

toninlg commented Jul 24, 2015

dscho commented Aug 7, 2015

toninlg commented Aug 9, 2015

dscho commented Aug 12, 2015

dscho commented Aug 13, 2015

dscho commented Aug 14, 2015

toninlg commented Aug 14, 2015

dscho commented Aug 15, 2015