diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2021-01-29 17:05:06 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2021-01-29 17:05:06 +0000 |
commit | 35f1cc3f7c6bec8a59b897ab624a5d850df85561 (patch) | |
tree | ce1a5fcd21f94af194f57a41b5786a24851a0515 | |
parent | 5f3829fa38fa736af588fa166f4fada4a7a6f86e (diff) |
gitattributes defuse: work even if .git/info/attributes missing
Treat this as "needs setup" rather than "needs adjustment".
Closes: #981344
Reported-by: Andrej Shadura <andrewsh@debian.org>
Tested-by: Andrej Shadura <andrewsh@debian.org>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3608,7 +3608,7 @@ sub is_gitattrs_setup () { # 0: there is a dgit-defuse-attrs but it needs fixing # undef: there is none my $gai = open_main_gitattrs(); - return 0 unless $gai; + return undef unless $gai; while (<$gai>) { next unless m{$gitattrs_ourmacro_re}; return 1 if m{\s-working-tree-encoding\s}; |