diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-11-07 23:12:42 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-11-07 23:55:31 +0000 |
commit | 2aa37b1e612e040ce9a661b4e016dc4bb6bd0b08 (patch) | |
tree | 386e484c854f5259fb34490b2288be30c33d9e2d /debian/changelog | |
parent | 862997ec70c49b644de04639f6f68bc8309e3d56 (diff) |
Cope when an orig tarball is a tarbomb.
Ie, if it contains other than one single directory toplevel.
Closes:#843422.
Specifically:
* We change the unpack directory to _unpack-tar in unpack, rather
than ../unpack-tar. This means that mktree_in_ud DTRT in that
directory, rather than in its supposed only subdiredctory
* We do write-tree on the whole tarball.
* Then if the tarball had only one subdir in it, we fish the
subtree's tree object out of the git tree object.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian/changelog')
-rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 691b783..41f2796 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ dgit (2.10~) unstable; urgency=medium so that users can easily track "jessie, or jessie-security". * Fix an unconditional print that was supposed to be a printdebug: origs <blah>.orig.tar.gz f.same=1 #f._differ=-1 + * Cope when an orig tarball is a tarbomb. Ie, if it contains + other than one single directory toplevel. Closes:#843422. -- |