chiark / gitweb /
git-debrebase: convert-to-gbp: Actually start from breakwater
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Aug 2018 12:31:15 +0000 (13:31 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Aug 2018 12:31:15 +0000 (13:31 +0100)
Contrary to the documentation, this operation would start from HEAD.
It should rewind to the breakwater.

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

index 74e5076..353b405 100755 (executable)
@@ -2633,11 +2633,11 @@ sub cmd_convert_to_gbp () {
     badusage "no arguments allowed" if @ARGV;
     my $head = get_head();
     my (undef, undef, undef, $ffq, $gdrlast) = ffq_prev_branchinfo();
-    keycommits $head, 0;
-    my $out;
+    my ($anchor, $breakwater) = keycommits $head, 0;
+    my $out = $breakwater;
     make_patches_staged $head;
     in_workarea sub {
-       $out = make_commit ['HEAD'], [
+       $out = make_commit [$out], [
             'Commit patch queue (converted from git-debrebase format)',
             '[git-debrebase convert-to-gbp: commit patches]',
         ];