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 4804c9bd055f39880a28676ce5ec8bac62099cd2..145fa9bb044be29d383f8849f7766ff0a72f2eab 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-36,6
+36,7
@@
use File::Path;
use File::Spec;
use File::Temp qw(tempdir);
use File::Basename;
use File::Spec;
use File::Temp qw(tempdir);
use File::Basename;
+use File::Copy ();
use Dpkg::Version;
use Dpkg::Compression;
use Dpkg::Compression::Process;
use Dpkg::Version;
use Dpkg::Compression;
use Dpkg::Compression::Process;
@@
-2659,6
+2660,8
@@
END
chomp $@;
progress "warning: $@";
$path = "$absurdity:$path";
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
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;
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 $@;
}
};
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();
# 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};
@@
-4596,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.";
}
}