chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: Add missing `chiark-utils-bin' to Test-Depends.
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index d1bf2136a6d86550f847e5d071322a3227885864..afe209e2f16fa61cf84828b689fc9021c6ab8672 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-30,6
+30,8
@@
use File::Path;
use File::Temp qw(tempdir);
use File::Basename;
use Dpkg::Version;
use File::Temp qw(tempdir);
use File::Basename;
use Dpkg::Version;
+use Dpkg::Compression;
+use Dpkg::Compression::Process;
use POSIX;
use IPC::Open2;
use Digest::SHA;
use POSIX;
use IPC::Open2;
use Digest::SHA;
@@
-4924,9
+4926,9
@@
sub quiltify_trees_differ ($$;$$$) {
unless $oldmode =~ m/^10/;
} else {
# creation
unless $oldmode =~ m/^10/;
} else {
# creation
- die "
non-default mode or typ
e\n"
- unless $newmode =~ m/^100644$/
||
- $
oldmode =~ m/^100644
$/;
+ die "
creation with non-default mod
e\n"
+ unless $newmode =~ m/^100644$/
or
+ $
newmode =~ m/^120000
$/;
}
};
if ($@) {
}
};
if ($@) {