diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:45 +0900 |
| commit | 15c96723457cfa1be6cdbd74e3131ecf13cd9790 (patch) | |
| tree | 99315f716fd87a85ddc06276be3424efe4cf9901 /contrib | |
| parent | f55734fd8c7209855d50c0acb45e7228899e41f7 (diff) | |
| parent | 2779f665054c3ba85c1ee298929e640149d84b1e (diff) | |
| download | git-15c96723457cfa1be6cdbd74e3131ecf13cd9790.tar.gz | |
Merge branch 'js/eol-on-ourselves'
Make sure our tests would pass when the sources are checked out
with "platform native" line ending convention by default on
Windows. Some "text" files out tests use and the test scripts
themselves that are meant to be run with /bin/sh, ought to be
checked out with eol=LF even on Windows.
* js/eol-on-ourselves:
t4051: mark supporting files as requiring LF-only line endings
Fix the remaining tests that failed with core.autocrlf=true
t3901: move supporting files into t/t3901/
completion: mark bash script as LF-only
git-new-workdir: mark script as LF-only
Fix build with core.autocrlf=true
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/.gitattributes | 1 | ||||
| -rw-r--r-- | contrib/workdir/.gitattributes | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/contrib/completion/.gitattributes b/contrib/completion/.gitattributes new file mode 100644 index 0000000000..19116944c1 --- /dev/null +++ b/contrib/completion/.gitattributes @@ -0,0 +1 @@ +*.bash eol=lf diff --git a/contrib/workdir/.gitattributes b/contrib/workdir/.gitattributes new file mode 100644 index 0000000000..1f78c5d1bd --- /dev/null +++ b/contrib/workdir/.gitattributes @@ -0,0 +1 @@ +/git-new-workdir eol=lf |