summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 23:37:22 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 23:43:08 +0100
commitf0345187fe63a3ef7dcb4ccb90f2b2dd2d384a17 (patch)
tree2c8e09948703a5e0eaf5b3305dc194407f9003af /git-debrebase
parent8f28dfa084b6d63e385d7fe538214eee2f90ea9e (diff)
git-debrebase: begin_convert_from: Break out $gdrlast_obj
NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase4
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);
}