zopencommunity / gitport

The Git version control system
Apache License 2.0
10 stars 5 forks source link

.gitattributes ignored ??? #115

Open lbdyck opened 7 months ago

lbdyck commented 7 months ago

This is my .gitattributes

# This .gitattributes file is autogenerated with zigi                                                
*                 git-encoding=iso8859-1 zos-working-tree-encoding=ibm-1047 linguist-language=REXX   
ZIGI/PANELS/*     git-encoding=iso8859-1 zos-working-tree-encoding=ibm-1047 linguist-language=PANELS 
.gitattributes    git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1                         
.gitignore        git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1                         
*.docm binary                                                                                        
*.docx binary                                                                                        
*.doc  binary                                                                                        
*.pdf  binary                                                                                        
*.epub binary                                                                                        
*.mobi binary                                                                                        
*.azw3 binary                                                                                        
*.pdf binary                                                                                         
ZIGI.PANELS/ZIGIEDIT git-encoding=BINARY zos-working-tree-encoding=BINARY binary           

When I cloned this repoistory the zigiedit was in the filesystem as text and not binary.

this is with git 2.44 - and this same issue with pdsegen:

PDSEGEN.PDS/CLS git-encoding=BINARY zos-working-tree-encoding=BINARY binary

IgorTodorovskiIBM commented 7 months ago

We don't support 'git-encoding=BINARY zos-working-tree-encoding=BINARY'. What happens if you remove that and keep the binary part?

And sorry I can't test it out myself at the moment (on vacation this week with no computer)

lbdyck commented 7 months ago

The .gitattributes doesa have just binary

example

CBTVIEW.PDS/UNZIPXMI git-encoding=BINARY zos-working-tree-encoding=BINARY binary

Enjoy your vacation

lbdyck commented 7 months ago

I removed the zos-working-tree-encoding=BINARY and now everything works fine with both the Rocket Git and the z/OS Open Tools Git. An update to zigi has been generated with a PR and I will be updating all my repositories that have this to remove it.

IgorTodorovskiIBM commented 7 months ago

I'll leave this open because I think we should be ignoring the case where zos-working-tree-encoding is set to BINARY. I believe right now it detects that BINARY is not supported and stops, ignoring the following binary attribute.

IgorTodorovskiIBM commented 7 months ago

Hmm, I cloned zigi and was not able to reproduce this:

ls -lT ./ZIGI.PANELS/ZIGIEDIT
b binary      T=off -rw-rw-r--   1 ITODORO  CDEV       13040 Apr  8 11:42 ./ZIGI.PANELS/ZIGIEDIT
[ITODORO@ZOSCAN2B ~/projects/zigi_def]$ file ./ZIGI.PANELS/ZIGIEDIT
./ZIGI.PANELS/ZIGIEDIT: binary data
[ITODORO@ZOSCAN2B ~/projects/zigi_def]$ git --version
git version 2.44.0
[ITODORO@ZOSCAN2B ~/projects/zigi_def]$ cat .gitattributes
# This .gitattributes file is autogenerated with zigi
*                 git-encoding=iso8859-1 zos-working-tree-encoding=ibm-1047 linguist-language=REXX
ZIGI/PANELS/*     git-encoding=iso8859-1 zos-working-tree-encoding=ibm-1047 linguist-language=PANELS
.gitattributes    git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1
.gitignore        git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1
*.docm binary
*.docx binary
*.doc  binary
*.pdf  binary
*.epub binary
*.mobi binary
*.azw3 binary
*.pdf binary
ZIGI.PANELS/ZIGIEDIT git-encoding=BINARY zos-working-tree-encoding=BINARY binary
lbdyck commented 7 months ago

Did you check ZIGI.PANELS/ZIGIEDIT git-encoding=BINARY zos-working-tree-encoding=BINARY binary ?

IgorTodorovskiIBM commented 7 months ago

This was after cloning https://github.com/zigi/zigi.git. I checked the attribute using chtag and looked at the .gitattributes file. Is there another way to check?