Do not fail when cloning a package containing dangling symlinks.

Closes:#848512.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index bb5db14a5219e97c717579821ff36c0da9c37da7..bca0690582740c560c52c02a5ffdb9023d8f8ed9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ dgit (2.12~) unstable; urgency=medium
     Closes:#847658.
   * By default, generate a DEP-14 tag as well as a dgit archive/*
     tag, even in non-split-view quilt modes.  Closes:#844129.
     Closes:#847658.
   * By default, generate a DEP-14 tag as well as a dgit archive/*
     tag, even in non-split-view quilt modes.  Closes:#844129.

+  * Do not fail when cloning a package containing dangling symlinks.
+    Closes:#848512.

 
   Test suite:
   * Provide and use stunt lintian and debuild, to avoid lintian
 
   Test suite:
   * Provide and use stunt lintian and debuild, to avoid lintian

diff --git a/dgit b/dgit
index 7996227a9d4895216eb722111b4aaee699206afc..992d2dad4efcc70f1c3dad292c1ee5e12da129f9 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3271,7 +3271,7 @@ sub clone_finish ($) {
     runcmd qw(bash -ec), <<'END';
         set -o pipefail
         git ls-tree -r --name-only -z HEAD | \
     runcmd qw(bash -ec), <<'END';
         set -o pipefail
         git ls-tree -r --name-only -z HEAD | \

-        xargs -0r touch -r . --
+        xargs -0r touch -h -r . --

 END
     printdone "ready for work in $dstdir";
 }
 END
     printdone "ready for work in $dstdir";
 }