chiark / gitweb /
git-debrebase: begin_convert_from: Break out $gdrlast_obj
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 22:37:22 +0000 (23:37 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 22:43:08 +0000 (23:43 +0100)
NFC

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

index d80c8d3..af19583 100755 (executable)
@@ -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);
 }