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
(parent:
8f28dfa
)
git-debrebase: begin_convert_from: Break out $gdrlast_obj
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 22:37:22 +0000
(23:37 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 22:43:08 +0000
(23:43 +0100)
NFC
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index d80c8d35bb1875e509f658077eb3a1ed7cb7c69a..af19583099526aa15a0042681753734639210d3f 100755
(executable)
--- 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);
}