chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
d1d2476
)
git-debrebase: record_ffq_prev_deferred: Move get_head();
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 7 Jul 2018 21:27:42 +0000
(22:27 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 8 Jul 2018 15:40:25 +0000
(16:40 +0100)
No functional change. This will make ff check easier to split out.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index f16a89c193b7830309d820b053a1299a06daf710..ddb7840cf997236d4d604c6468f84923209a2e53 100755
(executable)
--- 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;