X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=2c7828d1101edd4c6c98aa31b56cb560f6d1c9af;hb=7ec31b1b534340f4d5688c7862d1b95c11964059;hp=28d96ec583af6bf41e76e3ae03355dc5a979b98b;hpb=22c4f9bd68ac3cfc6a88fe4b4baf0a3ffda0a8b2;p=dgit.git diff --git a/git-debrebase b/git-debrebase index 28d96ec5..2c7828d1 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1243,12 +1243,14 @@ sub walk ($;$$$) { if ($nogenerate) { return (undef,undef); } - fail_unprocessable "found unprocessable commit, cannot cope". - (defined $cl->{Why} ? "; $cl->{Why}:": ':'). - " (commit $cur) (d.". - (join ' ', map { sprintf "%#x", $_->{Differs} } - @{ $cl->{Parents} }). - ")"; + my $d = + join ' ', + map { sprintf "%#x", $_->{Differs} } + @{ $cl->{Parents} }; + fail_unprocessable sprintf +(defined $cl->{Why} + ? 'found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)' + : 'found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)'), + $cur, $d, $cl->{Why}; }; my $build;