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:
6a3fc22
)
git-debrebase: record_gdrlast: Honour $oldvalue
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 22:12:34 +0000
(23:12 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 22:43:02 +0000
(23:43 +0100)
NFC for existing callers.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index f09508e1be90c859c60aa8a0220b1891853e86aa..630b8c261967d30838310f5465502952bfcd5cb1 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-433,9
+433,10
@@
sub ffq_prev_branchinfo () {
return gdr_ffq_prev_branchinfo($current);
}
-sub record_gdrlast ($$) {
- my ($gdrlast, $newvalue) = @_;
- push @deferred_updates, "update $gdrlast $newvalue $git_null_obj";
+sub record_gdrlast ($$;$) {
+ my ($gdrlast, $newvalue, $oldvalue) = @_;
+ $oldvalue ||= $git_null_obj;
+ push @deferred_updates, "update $gdrlast $newvalue $oldvalue";
}
sub gbp_pq_export ($$$) {