provide simple option to set unix style on windows platform(Git Bash)

[xheke]

• I was not able to find an open or closed issue matching what I'm seeing

Setup

• Which version of Git for Windows are you using? Is it 32-bit or 64-bit?

$ git --version --build-options

** insert your machine's response here **

git version 2.19.2.windows.1
cpu: x86_64
built from commit: 26dcaa1
sizeof-long: 4
sizeof-size_t: 8

• Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?

$ cmd.exe /c ver

** insert your machine's response here **

Microsoft Windows [Version 10.0.16299.726]

• What options did you set as part of the installation? Or did you choose the
  defaults?

# One of the following:
> type "C:\Program Files\Git\etc\install-options.txt"
> type "C:\Program Files (x86)\Git\etc\install-options.txt"
> type "%USERPROFILE%\AppData\Local\Programs\Git\etc\install-options.txt"
$ cat /etc/install-options.txt

** insert your machine's response here **

$ cat /etc/install-options.txt
Editor Option: VIM
Custom Editor Path:
Path Option: Cmd
SSH Option: OpenSSH
CURL Option: OpenSSL
CRLF Option: LFOnly
Bash Terminal Option: MinTTY
Performance Tweaks FSCache: Enabled
Use Credential Manager: Enabled
Enable Symlinks: Disabled

• Any other interesting things about your environment that might be related
  to the issue you're seeing?

** insert your response here **

Details

• Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other

** insert your response here **
GIT bash

• What commands did you run to trigger this issue? If you can provide a
  Minimal, Complete, and Verifiable example
  this will help us understand the issue.

** insert your commands here **

git apply ../diff/abc.diff

• What did you expect to occur after running these commands?

** insert here **

We want prevent commit code files with DOS format to repository.

Therefore, we enable client standard/default pre-commit hook on both Linux side and Windows side.

The hook works fine on Linux side as expected, but not works on Windows side.

We also observed that when we try to import diff with new DOS format files on the Linux side, GIT will report some whitespace warnings and this may lead commit failure with pre-commit hook impact. However, nothing happened on windows side if we do the same commands, and the commit will success even we enable the same pre-commit hook on Windows side.

We hope team can work with same style, no matter he/she work on Linux side or Windows side.

The behavior is different between Windows side and Linux side currently. In addition, we try to set core.autocrlf and core.safecrlf on Windows side, anyway, it does not prevent commit. Therefore, we hope if there have simple option to set like Linux-style on GIT bash (Windows Side) to simulate Linux environment (perhaps just for file format checking is enough) on Windows side.

• What actually happened instead?

** insert here **
no whitespace warnings report

• If the problem was occurring with a specific repository, can you provide the
  URL to that repository to help us with testing?

** insert URL here **

[dscho]

find out all ^M errors caused by CRLF (DOS format)

Could you elaborate?

pre-commit hook can work on linux to prevent ^M commited as expected

What pre-commit hook?

It would be good to come up with a Minimal, Complete & Verifiable Example to drive this ticket forward.

[xheke]

rewrite the description, please comment if anything is still not clear. Thanks.

[dscho]

Therefore, we enable client standard/default pre-commit hook on both Linux side and Windows side.

The hook works fine on Linux side as expected, but not works on Windows side.

Without seeing that hook, there is little anybody else can do (except for conjecturing wild guesses).

In any case, it might be as benign as a lack of the appropriate eol attributes in your .gitattributes. See https://www.edwardthomson.com/blog/git_for_windows_line_endings.html for details.

And for the record, your edits did not provide any example, let alone a minimal, complete & verifiable one. So the ball is squarely in your court, still.

[xheke]

Thanks dscho very much.

I think “* text=auto” is the solution that what we are looking for. I will try to suggest our administrator to set this in the repository.

But personally, I still suggest GIT-bash can provide unix-style option for local git configuration on windows system. Since autocrlf is not suggested for cross-platform team work.

For this issue reproduction, we can follow below steps:
1, change .git\hooks\pre-commit.sample to pre-commit
2, add one DOS-format file
3, make the diff for this new add DOS file
4, git reset
5, apply the diff
Case for linux platform: we can see whitespace error, and commit will failed prevented by pre-commit hook.
Case for windows platform: no whitespace error, and commit will success, pre-commit hook can not prevent commit at all.

[dscho]

For this issue reproduction, we can follow below steps:
1, change .git\hooks\pre-commit.sample to pre-commit
2, add one DOS-format file
3, make the diff for this new add DOS file
4, git reset
5, apply the diff
Case for linux platform: we can see whitespace error, and commit will failed prevented by pre-commit hook.
Case for windows platform: no whitespace error, and commit will success, pre-commit hook can not prevent commit at all.

In these steps, I do not see any git commit command, so I am puzzled how the pre-commit hook plays any role here.

Could you please turn this MCVE into a real script?

[xheke]

Hi dscho,

Please following below steps and try to reproduce it on Windows platform:

1, change .git\hooks\pre-commit.sample to pre-commit
2, git reset --hard
3, add one DOS-format file, such as dos.txt
4, git add -A
5, git diff --cached > ../mydiff/dos.diff
6, git reset --hard
7, git apply ../mydiff/dos.diff
8, git add -A
9, git commit

Here will no warning in Step 7, and will success on step 9.
But if we do the step 6&7 just with same diff on the Linux platform, here will get warning and lead step 9 failure.

Thanks,
Ke

[dscho]

@xheke so when I try this, I see what you are seeing. But on Windows, the committed file is not CR/LF. It is in the worktree, but not in the Git index (verify for yourself, using git ls-files --eol).

To get the same behavior on Windows as on Linux, you simply have to set core.autocrlf to false on Windows.

You can even do that by choosing the option "Checkout as-is, commit as-is" in Git for Windows' installer.

Does that clarify why you see what you see?

[xheke]

Hi dscho,
As I said, it doesn't work.
Sure, we can set core.autocrlf to false, but the problem is the new guys or some team players always forget to check the new files created is UNIX-style or Windows-style(rely on their edit tools), and when they commit their work, the pre-commit hook doesn’t work fine as we see.

That why we need one option to set UNIX-style or Windows-style for git base environment, we hope when we set UNIX-style option for git bash, the pre-commit hook (or something else, perhaps is diff) can auto detect the DOS format files and prevent commit as on UNIX platform behavior.

Thanks for your help.
Ke

[dscho]

we need one option to set UNIX-style or Windows-style for git base environment

Yes, and we do have that. I even pointed it out to you:

You can even do that by choosing the option "Checkout as-is, commit as-is" in Git for Windows' installer.

This is the option that you asked for.

Having said that, I think you'd be a lot better served by following the excellent advice in https://www.edwardthomson.com/blog/git_for_windows_line_endings.html. Since you want Unix line endings (LF-only, to be precise) in all your files, just add a file .gitattributes (unless it exists already) and declare * eol=lf.

In short: there are ways in Git to get what you want.