From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 22:12:34 +0000 (+0100)
Subject: git-debrebase: record_gdrlast: Honour $oldvalue
X-Git-Tag: archive/debian/6.7~18
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=b68ef4ba62ce372148911de6a9c9b0f69f78c4d8

git-debrebase: record_gdrlast: Honour $oldvalue

NFC for existing callers.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index f09508e1..630b8c26 100755
--- 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 ($$$) {