diff options
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index d80c8d3..af19583 100755 --- a/git-debrebase +++ b/git-debrebase @@ -2416,9 +2416,11 @@ sub begin_convert_from () { fail "ffq-prev exists, this is already managed by git-debrebase!" if $ffq_prev && git_get_ref $ffq_prev; + + my $gdrlast_obj = $gdrlast && git_get_ref $gdrlast; snag 'already-converted', "ahead of debrebase-last, this is already managed by git-debrebase!" - if $gdrlast && git_get_ref $gdrlast && is_fast_fwd $gdrlast, $head; + if $gdrlast_obj && is_fast_fwd $gdrlast_obj, $head; return ($head, undef); } |