git-debrebase: record_gdrlast: Honour $oldvalue

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 2e0882dfa6e2c9c70646d646c07db591e4c8b6e7..630b8c261967d30838310f5465502952bfcd5cb1 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -428,9 +428,15 @@ sub any_snags () {
     return $snags_forced || $snags_tripped;
 }
 
     return $snags_forced || $snags_tripped;
 }
 

-sub record_gdrlast ($$) {
-    my ($gdrlast, $newvalue) = @_;
-    push @deferred_updates, "update $gdrlast $newvalue $git_null_obj";
+sub ffq_prev_branchinfo () {
+    my $current = git_get_symref();
+    return gdr_ffq_prev_branchinfo($current);
+}
+
+sub record_gdrlast ($$;$) {
+    my ($gdrlast, $newvalue, $oldvalue) = @_;
+    $oldvalue ||= $git_null_obj;
+    push @deferred_updates, "update $gdrlast $newvalue $oldvalue";

 }
 
 sub gbp_pq_export ($$$) {
 }
 
 sub gbp_pq_export ($$$) {


@@ -1740,11 +1746,6 @@ sub cmd_analyse () {
     STDOUT->error and die $!;
 }
 
     STDOUT->error and die $!;
 }
 

-sub ffq_prev_branchinfo () {
-    my $current = git_get_symref();
-    return gdr_ffq_prev_branchinfo($current);
-}
-

 sub ffq_check ($;$$) {
     # calls $ff and/or $notff zero or more times
     # then returns either (status,message) where status is
 sub ffq_check ($;$$) {
     # calls $ff and/or $notff zero or more times
     # then returns either (status,message) where status is