diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 23:12:34 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 23:43:02 +0100 |
commit | b68ef4ba62ce372148911de6a9c9b0f69f78c4d8 (patch) | |
tree | af54f078f1cd3ea63c34848dee0d3854a5dd24b5 | |
parent | 6a3fc22a4ad2b36bd799b1f9e3b7d65dcd4a6839 (diff) |
git-debrebase: record_gdrlast: Honour $oldvalue
NFC for existing callers.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | git-debrebase | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index f09508e..630b8c2 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 ($$$) { |