X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=dgit;h=145fa9bb044be29d383f8849f7766ff0a72f2eab;hb=193cfa37a544a2c44f9252b83da54ca1af01c01f;hp=716cecfd5febfbd7452229a8caa2e99c890ce146;hpb=ece5816db28a48e097d99da1bfaf4d853726b851;p=dgit.git

diff --git a/dgit b/dgit
index 716cecfd..145fa9bb 100755
--- a/dgit
+++ b/dgit
@@ -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};
@@ -4604,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.";
 	}
     }