X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=dd1ddb0a9cc7d350323d33e7a3ff9350c1f4686e;hb=26da7fadd1341cd8aa244153c1f96221fd9e9b3b;hp=ee98f09f9b121a5affb978c83314c4255a8859c0;hpb=6e88f791b68d7ee8ddb97433aae6649d7b61d14d;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index ee98f09f..dd1ddb0a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -305,7 +305,7 @@ sub classify ($) {
 	push @p, {
             Ix => $#p,
             CommitId => $ph,
-            Differs => (get_differs $t, $ph),
+            Differs => (get_differs $ph, $t),
         };
     }
 
@@ -475,7 +475,9 @@ sub walk ($;$$) {
 	if ($nogenerate) {
 	    return (undef,undef);
 	}
-	die "commit $cur: Cannot cope with this commit";
+	die "commit $cur: Cannot cope with this commit (d.".
+	    (join ' ', map { sprintf "%#x", $_->{Differs} }
+	     @{ $cl->{Parents} }). ")";
     };
 
     my $build;