diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-12-19 14:54:30 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-12-19 16:58:57 +0000 |
commit | fafc9c67bc9cf27f4624e9def9e9deafffdfc442 (patch) | |
tree | 57a0b29c5b400591e5fbcb6c230ec4493f1b60b0 | |
parent | f39ed7a7a7cc43b0be9cf026fd94eebc0da59191 (diff) |
absurd/git: Do not fail to import a .dsc containing patches to .git/ (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | absurd/git | 8 | ||||
-rw-r--r-- | debian/changelog | 1 |
2 files changed, 9 insertions, 0 deletions
@@ -95,7 +95,15 @@ END printf "%s\n" "$omgwtf" >debian/patches/series printf "%s\n" "$patch" >>debian/patches/series +# Just in case some joker tries to patch .git/something +mv .git ../.git +set +e dpkg-source --before-build . +rc=$? +set -e +rm -rf .git +mv ../.git . +test $rc = 0 rm -f $omgwtf debian/patches/$omgwtf diff --git a/debian/changelog b/debian/changelog index e26c4de..d4e18e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ dgit (2.12~) unstable; urgency=medium on a patch during .dsc import. Apropos of #848391. * Do not fail to import a .dsc containing patches which patch files multiple times, due to #848611. Closes:#848391. + * Do not fail to import a .dsc containing patches to .git/ (!) Test suite: * Provide and use stunt lintian and debuild, to avoid lintian |