chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit.1: drop remark about sbuild not building arch-independent
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 716cecfd5febfbd7452229a8caa2e99c890ce146..145fa9bb044be29d383f8849f7766ff0a72f2eab 100755
(executable)
--- 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();
# 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};
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".
" of the archive's version.\n".
"To overwrite the archive's contents,".
" pass --overwrite[=VERSION].\n".
- "To rew
ind
history, if permitted by the archive,".
+ "To rew
rite
history, if permitted by the archive,".
" use --deliberately-not-fast-forward.";
}
}
" use --deliberately-not-fast-forward.";
}
}