summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index af19583..9d0bda0 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2421,12 +2421,14 @@ sub begin_convert_from () {
snag 'already-converted',
"ahead of debrebase-last, this is already managed by git-debrebase!"
if $gdrlast_obj && is_fast_fwd $gdrlast_obj, $head;
- return ($head, undef);
+ return ($head, { LastRef => $gdrlast, LastObj => $gdrlast_obj });
}
sub complete_convert_from ($$$$) {
my ($old_head, $new_head, $gi, $mrest) = @_;
ffq_check $new_head;
+ record_gdrlast $gi->{LastRef}, $new_head, $gi->{LastObj}
+ if $gi->{LastRef};
snags_maybe_bail();
update_head_checkout $old_head, $new_head, $mrest;
}