From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Jul 2017 20:44:46 +0000 (+0100)
Subject: git-debrebase: WIP FOUND
X-Git-Tag: archive/debian/5.0~328
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ec16cbbcad6e3905ca67bad9102da899ac8915d0

git-debrebase: WIP FOUND
---

diff --git a/git-debrebase b/git-debrebase
index 71fb11e6..801b552a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -112,6 +112,8 @@ use Getopt::Long qw(:config posix_default gnu_compat bundling);
 
 use Debian::Dgit qw(:DEFAULT $wa);
 
+$wa = '.git/debrebase/work';
+
 sub badusage ($) {
     my ($m) = @_;
     die "bad usage: $m\n";
@@ -375,6 +377,8 @@ sub classify ($) {
     my ($stype, $series) = git_cat_file "$t:debian/patches/series";
     my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
 
+@p = reverse @p; #xxx
+
     # How to decide about l/r ordering of breakwater merges ?  git
     # --topo-order prefers to expand 2nd parent first.  There's
     # already an easy rune to look for debian/ history anyway (git log
@@ -568,13 +572,13 @@ sub walk ($;$$) {
 
     # Now we build it back up again
 
-    workarea_fresh();
+    fresh_workarea();
 
     my $rewriting = 0;
 
     my $rm_tree_cached = sub {
 	my ($subdir) = @_;
-	runcmd @git, qw(rm --quiet -rf --cached), $subdir;
+	runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir;
     };
     my $read_tree_debian = sub {
 	my ($treeish) = @_;