diff options
-rw-r--r-- | Debian/Dgit.pm | 5 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 5b5591d..6977ed2 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -55,7 +55,8 @@ BEGIN { initdebug enabledebug enabledebuglevel printdebug debugcmd $debugprefix *debuglevel *DEBUG - shellquote printcmd messagequote); + shellquote printcmd messagequote + $negate_harmful_gitattrs); # implicitly uses $main::us %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO NOCOMMITCHECK)] ); @EXPORT_OK = @{ $EXPORT_TAGS{policyflags} }; @@ -82,6 +83,8 @@ sub NOCOMMITCHECK () { return 0x8; } our $debugprefix; our $debuglevel = 0; +our $negate_harmful_gitattrs = "-text -eol -crlf -ident -filter"; + our $forkcheck_mainprocess; sub forkcheck_setup () { @@ -3378,7 +3378,7 @@ END open GAO, "> $af.new" or die $!; print GAO <<END or die $!; * dgit-defuse-attrs -[attr]dgit-defuse-attrs -text -eol -crlf -ident -filter +[attr]dgit-defuse-attrs $negate_harmful_gitattrs # ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1) END my $gai = open_gitattrs(); |