X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=5bd39e70a84b92086d35041c0f4c4fd64ddb75f7;hb=bee6f2e6f73394c340d37d22c3636fc5ffb4bf97;hp=7b16ff3fa31cc5bf1a7b30df1cbdd9b03419236c;hpb=d76f34bfa71c438efec0aadf37482dea6360968a;p=dgit.git

diff --git a/dgit b/dgit
index 7b16ff3f..5bd39e70 100755
--- a/dgit
+++ b/dgit
@@ -2,7 +2,7 @@
 # dgit
 # Integration between git and Debian-style archives
 #
-# Copyright (C)2013-2015 Ian Jackson
+# Copyright (C)2013-2016 Ian Jackson
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -3211,17 +3211,20 @@ END
     my ($tree,$dir) = mktree_in_ud_from_only_subdir();
     check_for_vendor_patches() if madformat($dsc->{format});
     changedir '../../../..';
-    my $diffopt = $debuglevel>0 ? '--exit-code' : '--quiet';
-    my @diffcmd = (@git, qw(diff), $diffopt, $tree, $dgithead);
+    my @diffcmd = (@git, qw(diff --quiet), $tree, $dgithead);
     debugcmd "+",@diffcmd;
     $!=0; $?=-1;
     my $r = system @diffcmd;
     if ($r) {
 	if ($r==256) {
-	    fail "$dscfn specifies a different tree to your HEAD commit;".
-		" perhaps you forgot to build".
-		($diffopt eq '--exit-code' ? "" :
-		 " (run with -D to see full diff output)");
+	    my $diffs = cmdoutput @git, qw(diff --stat), $tree, $dgithead;
+	    fail <<END
+HEAD specifies a different tree to $dscfn:
+$diffs
+Perhaps you forgot to build.  Or perhaps there is a problem with your
+ source tree (see dgit(7) for some hints).  To see a full diff, run
+   git diff $tree HEAD
+END
 	} else {
 	    failedcmd @diffcmd;
 	}
@@ -4143,6 +4146,16 @@ sub quiltify ($$$$) {
 	if (!defined $patchname) {
 	    $patchname = $title;
 	    $patchname =~ s/[.:]$//;
+            use Text::Iconv;
+	    eval {
+		my $converter = new Text::Iconv qw(UTF-8 ASCII//TRANSLIT);
+		my $translitname = $converter->convert($patchname);
+		die unless defined $translitname;
+		$patchname = $translitname;
+	    };
+	    print STDERR
+		"dgit: patch title transliteration error: $@"
+		if $@;
 	    $patchname =~ y/ A-Z/-a-z/;
 	    $patchname =~ y/-a-z0-9_.+=~//cd;
 	    $patchname =~ s/^\W/x-$&/;