summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-07 22:27:42 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-07-08 16:40:25 +0100
commit238568870c670cd067578807c0a4f369f9af1c8a (patch)
tree823235fa3fce99e6dcdac02506a6a5f76c336a78
parentd1d2476d690733d7a42ad4bde76b08ad73ac299e (diff)
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>
-rwxr-xr-xgit-debrebase4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase
index f16a89c..ddb7840 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;