diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-08 16:36:05 -0700 |
|---|---|---|
| committer | Johannes Sixt <j6t@kdbg.org> | 2024-05-05 16:54:35 +0200 |
| commit | 6a8c13e03daf42aba9eed55a4f8d6be8ec3efd88 (patch) | |
| tree | 8c60bdfc0dce346d1fff62e20ee548f9bb9b6de1 | |
| parent | Makefile(s): avoid recipe prefix in conditional statements (diff) | |
| download | git-6a8c13e03daf42aba9eed55a4f8d6be8ec3efd88.tar.gz git-6a8c13e03daf42aba9eed55a4f8d6be8ec3efd88.zip | |
Makefile(s): do not enforce "all indents must be done with tab"
Our top-level Makefile follows our generic whitespace rule
established by the top-level .gitattributes file that does not
enforce indent-with-non-tab rule by default, but git-gui is set up
to enforce indent-with-non-tab by default. With the upcoming change
to GNU make, we no longer can reject (and worse, "fix") a patch that
adds whitespace indented lines to the Makefile, so loosen the rule
there for git-gui/Makefile, too.
[j6t: cherry-picked from 227b8fd90240]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Diffstat (limited to '')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 59cd41dbff..118d56cfbd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ git-gui.sh encoding=UTF-8 /po/*.po encoding=UTF-8 /GIT-VERSION-GEN eol=lf +Makefile whitespace=!indent,trail,space |