From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 31 Jul 2018 06:58:15 +0000 (+0100)
Subject: git-debrebase: keycommits: Pass correct argument to fail
X-Git-Tag: archive/debian/6.3~14
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a2adcd961613b1570dea721391e9f5c9665ba642

git-debrebase: keycommits: Pass correct argument to fail

We got the array index wrong and would print HASH(0x55be4dba1f88) or
whatever.

Closes:#905003.

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

diff --git a/debian/changelog b/debian/changelog
index 6124ea72..9d22bed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (6.3~) unstable; urgency=medium
 
-  * 
+  * git-debrebase: breakwater: Fix error message for unprocessable
+    commits.  Closes:#905003.
 
  --
 
diff --git a/git-debrebase b/git-debrebase
index 0c351a47..8385ae48 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -573,7 +573,7 @@ sub keycommits ($;$$$$) {
     my ($anchor, $breakwater);
     my $clogonly;
     my $cl;
-    $fatal //= sub { fail $_[2]; };
+    $fatal //= sub { fail $_[1]; };
     my $x = sub {
 	my ($cb, $tagsfx, $mainwhy, $xwhy) = @_;
 	my $why = $mainwhy.$xwhy;