diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 13:31:15 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 13:31:15 +0100 |
commit | 7b8e6ff1d7c697ec131f6ab9106583c8a28d3e7f (patch) | |
tree | a4b076d8faf90ddcff002a7296d6fad61f0054a0 /git-debrebase | |
parent | d94ac406e0f237759420caf6eca996c4ffee1ca9 (diff) |
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 <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index 74e5076..353b405 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]', ]; |