From 227b8fd9024084209fc5fb24f89f3abe8c51592f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 8 Apr 2024 16:36:05 -0700 Subject: [PATCH] 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. Signed-off-by: Junio C Hamano --- git-gui/.gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/git-gui/.gitattributes b/git-gui/.gitattributes index 59cd41dbff..118d56cfbd 100644 --- a/git-gui/.gitattributes +++ b/git-gui/.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