From 7b8e6ff1d7c697ec131f6ab9106583c8a28d3e7f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Aug 2018 13:31:15 +0100 Subject: [PATCH] git-debrebase: convert-to-gbp: Actually start from breakwater Contrary to the documentation, this operation would start from HEAD. It should rewind to the breakwater. Signed-off-by: Ian Jackson --- git-debrebase | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-debrebase b/git-debrebase index 74e50768..353b405f 100755 --- a/git-debrebase +++ b/git-debrebase @@ -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]', ]; -- 2.30.2