git-debrebase: record_gdrlast: Honour $oldvalue

[dgit.git] / git-debrebase

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 ($$$) {