summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-03-10 17:40:35 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-07-18 22:08:43 +0100
commit6fab00d6201f741f87cc89a0a24443db584c4162 (patch)
tree43591893808521f870a7ff49f5ea00b5ffd147b9
parent4523f77bba9b97925030bcf641584a4a74819178 (diff)
Dgit.pm: $negate_harmful_gitattrs: Break out from dgit
No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--Debian/Dgit.pm5
-rwxr-xr-xdgit2
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 () {
diff --git a/dgit b/dgit
index 54ba4d6..3cf7705 100755
--- a/dgit
+++ b/dgit
@@ -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();