summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2017-05-09 12:53:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-10 04:32:50 (GMT)
commit00ddc9d13cadb66d51e72107109baef1b3ca7c70 (patch)
tree82597dfca402a9ea7f06ac70e868550b069d684d /git-gui
parent4fa66c85f11bc5a541462ca5ae3246aa0ce02e74 (diff)
downloadgit-00ddc9d13cadb66d51e72107109baef1b3ca7c70.zip
git-00ddc9d13cadb66d51e72107109baef1b3ca7c70.tar.gz
git-00ddc9d13cadb66d51e72107109baef1b3ca7c70.tar.bz2
Fix build with core.autocrlf=true
On Windows, the default line endings are denoted by a Carriage Return byte followed by a Line Feed byte, while Linux and MacOSX use a single Line Feed byte to denote a line ending. To help with this situation, Git introduced several mechanisms over the last decade, most prominently the `core.autocrlf` setting. Sometimes, however, a single setting is incorrect, e.g. when certain files in the source code are to be consumed by software that can handle only LF line endings, while other files can use whatever is appropriate for the current platform. To allow for that, Git added the `eol` option to its .gitattributes handling, expecting every user of Git to mark their source code appropriately. Bash assumes that line-endings of scripts are denoted by a single Line Feed byte. Therefore, shell scripts in Git's source code are one example where that `eol=lf` option is *required*. When generating common-cmds.h, the Unix tools we use generally operate on the assumption that input and output deliminate their lines using LF-only line endings. Consequently, they would happily copy the CR byte verbatim into the strings in common-cmds.h, which in turn makes the C preprocessor barf (that interprets them as MacOS-style line endings). Therefore, we have to mark the input files as LF-only: command-list.txt and Documentation/git-*.txt. Quite a bit belatedly, this patch brings Git's own source code in line with those expectations by setting those attributes to allow for a correct build even when core.autocrlf=true. This patch can be validated even on Linux, by using this cadence: git config core.autocrlf true rm .git/index && git stash make -j15 DEVELOPER=1 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui')
-rw-r--r--git-gui/.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/.gitattributes b/git-gui/.gitattributes
index 33d07c0..59cd41d 100644
--- a/git-gui/.gitattributes
+++ b/git-gui/.gitattributes
@@ -2,3 +2,4 @@
* encoding=US-ASCII
git-gui.sh encoding=UTF-8
/po/*.po encoding=UTF-8
+/GIT-VERSION-GEN eol=lf