git-debrebase: new-upstream-v0: use last upstream merge in breakwater branch

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 8a431110faad1fc0b47aee9ec9220aba48262612..8c77dbccdcc1bc9c713983a30d33ba5cb2b730f4 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -831,10 +831,13 @@ sub cmd_new_upstream_v0 () {
     # now we need to investigate the branch this generates the
     # laundered version but we don't switch to it yet
     my $old_head = get_head();
     # now we need to investigate the branch this generates the
     # laundered version but we don't switch to it yet
     my $old_head = get_head();

-    my ($old_laundered_tip,$old_bw) = walk $old_head;
+    my ($old_laundered_tip,$old_bw,$old_upstream_update) = walk $old_head;

 
     my $old_bw_cl = classify $old_bw;
 
     my $old_bw_cl = classify $old_bw;

-    my $old_upstream = parsecommit $old_bw_cl->{OrigParents}[0]{CommitId};
+    my $old_upstream_update_cl = classify $old_upstream_update;
+    confess unless $old_upstream_update_cl->{OrigParents};
+    my $old_upstream = parsecommit
+        $old_upstream_update_cl->{OrigParents}[0]{CommitId};

 
     my $problems = 0;
     my $problem = sub {
 
     my $problems = 0;
     my $problem = sub {