dgit: unrepres. changes: Tolerate creation of symlinks

Experimentally, dpkg-source on stretch will create patches to create
new symlinks.  (It will fail on attempts to modify existing symlinks
and it ignores attempts to change plain file executability.)

Implementation: add an alternative which tolerates the git symlink
mode.  This replaces the check on $oldmode, which in this context we
know is all 0s and can therefore never match.

While we're here, change the error message.

Closes:#857382.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/dgit b/dgit
index d1bf213..42647ce 100755
--- a/dgit
+++ b/dgit
@@ -4924,9 +4924,9 @@ sub quiltify_trees_differ ($$;$$$) {
 			unless $oldmode =~ m/^10/;
 		} else {
 		    # creation
-		    die "non-default mode or type\n"
-			unless $newmode =~ m/^100644$/ ||
-			       $oldmode =~ m/^100644$/;
+		    die "creation with non-default mode\n"
+			unless $newmode =~ m/^100644$/ or
+			       $newmode =~ m/^120000$/;
 		}
 	    };
 	    if ($@) {