X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=af19583099526aa15a0042681753734639210d3f;hb=f0345187fe63a3ef7dcb4ccb90f2b2dd2d384a17;hp=d80c8d35bb1875e509f658077eb3a1ed7cb7c69a;hpb=8f28dfa084b6d63e385d7fe538214eee2f90ea9e;p=dgit.git diff --git a/git-debrebase b/git-debrebase index d80c8d35..af195830 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); }