From f0345187fe63a3ef7dcb4ccb90f2b2dd2d384a17 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 23:37:22 +0100 Subject: git-debrebase: begin_convert_from: Break out $gdrlast_obj NFC Signed-off-by: Ian Jackson --- git-debrebase | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); } -- cgit v1.2.3