Split brain: Improve quiltify() message

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 4d7c7219f80ce2ab52d2e712e33399a40313b541..295bbdf1ed1c323cb48bdfe9c6cbb3de60fdce32 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2540,8 +2540,8 @@ sub quilt_could_gbp ($$$) {
        quiltify_trees_differ($userhead,$applied,1);
 }
 
-sub quiltify ($$$) {
-    my ($clogp,$target,$unapplied) = @_;
+sub quiltify ($$$$) {
+    my ($clogp,$target,$unapplied,$oldtiptree) = @_;
 
     # Quilt patchification algorithm
     #
@@ -2567,12 +2567,6 @@ sub quiltify ($$$) {
     # After traversing PT, we git commit the changes which
     # should be contained within debian/patches.
 
-    changedir '../fake';
-    rmtree '.pc';
-    runcmd @git, qw(add -Af .);
-    my $oldtiptree=git_write_tree();
-    changedir '../work';
-
     # The search for the path S..T is breadth-first.  We maintain a
     # todo list containing search nodes.  A search node identifies a
     # commit, and looks something like this:
@@ -2688,7 +2682,7 @@ sub quiltify ($$$) {
            if (quilt_could_gbp($target,$unapplied,$oldtiptree)) {
                print STDERR <<END;
 $us: Tree looks like a patches-unapplied git branch.
-$us: Maybe you forgot --quilt=gbp (aka --quilt=apply) ?
+$us: Maybe you forgot --quilt=gbp (or --quilt=apply) ?
 END
            }
            fail "quilt fixup naive history linearisation failed.\n".
@@ -2994,7 +2988,13 @@ END
         rename '../fake/.pc','.pc' or die $!;
     }
 
-    quiltify($clogp,$headref,$unapplied);
+    changedir '../fake';
+    rmtree '.pc';
+    runcmd @git, qw(add -Af .);
+    my $oldtiptree=git_write_tree();
+    changedir '../work';
+
+    quiltify($clogp,$headref,$unapplied,$oldtiptree);
 
     if (!open P, '>>', ".pc/applied-patches") {
        $!==&ENOENT or die $!;