From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Jul 2018 21:27:42 +0000 (+0100)
Subject: git-debrebase: record_ffq_prev_deferred: Move get_head();
X-Git-Tag: archive/debian/5.9~19
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=238568870c670cd067578807c0a4f369f9af1c8a;hp=d1d2476d690733d7a42ad4bde76b08ad73ac299e

git-debrebase: record_ffq_prev_deferred: Move get_head();

No functional change.  This will make ff check easier to split out.

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

diff --git a/git-debrebase b/git-debrebase
index f16a89c1..ddb7840c 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -992,12 +992,12 @@ sub record_ffq_prev_deferred () {
     # if "deferred", will have added something about that to
     #   @deferred_update_messages, and also maybe printed (already)
     #   some messages about ff checks
+    my $currentval = get_head();
+
     my ($status, $message, $current, $ffq_prev, $gdrlast)
 	= ffq_prev_branchinfo();
     return ($status, $message) unless $status eq 'branch';
 
-    my $currentval = get_head();
-
     my $exists = git_get_ref $ffq_prev;
     return ('exists',"$ffq_prev already exists") if $exists;