git-debrebase: begin_convert_from: Break out $gdrlast_obj

NFC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index d80c8d35bb1875e509f658077eb3a1ed7cb7c69a..af19583099526aa15a0042681753734639210d3f 100755 (executable)
--- 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;
 
     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!"
     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);
 }
 
     return ($head, undef);
 }