X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=145fa9bb044be29d383f8849f7766ff0a72f2eab;hb=193cfa37a544a2c44f9252b83da54ca1af01c01f;hp=4804c9bd055f39880a28676ce5ec8bac62099cd2;hpb=9b22c0de92ec58e5469d789c3d875098e2a82924;p=dgit.git

diff --git a/dgit b/dgit
index 4804c9bd..145fa9bb 100755
--- a/dgit
+++ b/dgit
@@ -36,6 +36,7 @@ use File::Path;
 use File::Spec;
 use File::Temp qw(tempdir);
 use File::Basename;
+use File::Copy ();
 use Dpkg::Version;
 use Dpkg::Compression;
 use Dpkg::Compression::Process;
@@ -2659,6 +2660,8 @@ END
 		chomp $@;
 		progress "warning: $@";
 		$path = "$absurdity:$path";
+		open T, ">../../absurd-apply-warnings" or die $!;
+		close T or die $!;
 		progress f_ "%s: trying slow absurd-git-apply...", $us;
 		rename "../../gbp-pq-output","../../gbp-pq-output.0"
 		    or $!==ENOENT
@@ -2693,6 +2696,11 @@ gbp-pq import and dpkg-source disagree!
  dpkg-source --before-build gave tree %s
 END
 		$rawimport_hash = $gapplied;
+
+		if ($use_absurd) {
+		    File::Copy::copy("../../absurd-apply-warnings", \*STDERR)
+			  or die $!;
+		}
 	    };
 	    last unless $@;
 	}
@@ -3600,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};
@@ -4596,7 +4604,7 @@ END
 	        " of the archive's version.\n".
 		"To overwrite the archive's contents,".
 		" pass --overwrite[=VERSION].\n".
-		"To rewind history, if permitted by the archive,".
+		"To rewrite history, if permitted by the archive,".
 		" use --deliberately-not-fast-forward.";
 	}
     }