X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=git-debrebase;h=dc55df8c821e93a37961d859b64ac68ba7881a7c;hb=8d534ac9006cef95a5b2e9e882039bcabb945543;hp=8a431110faad1fc0b47aee9ec9220aba48262612;hpb=a75a91f40d31452a0c02761540416e5957f91d35;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 8a431110..dc55df8c 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -657,6 +657,7 @@ sub walk ($;$$) {
     my $read_tree_debian = sub {
 	my ($treeish) = @_;
 	read_tree_subdir 'debian', "$treeish:debian";
+        rm_subdir_cached 'debian/patches';
     };
     my $read_tree_upstream = sub {
 	my ($treeish) = @_;
@@ -831,10 +832,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();
-    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_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 {