From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jun 2016 11:19:21 +0000 (+0100)
Subject: Split brain: Rename $origtree to $unapplied (nfc)
X-Git-Tag: archive/debian/2.0~327
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=7fd3c5ea27a4713cbd9673fd63970e2e0123d332

Split brain: Rename $origtree to $unapplied (nfc)

This is clearer.
---

diff --git a/dgit b/dgit
index 97bd2831..77f8819e 100755
--- a/dgit
+++ b/dgit
@@ -2533,7 +2533,7 @@ sub quiltify_tree_sentinelfiles ($) {
 }
 
 sub quiltify ($$$) {
-    my ($clogp,$target,$origtree) = @_;
+    my ($clogp,$target,$unapplied) = @_;
 
     # Quilt patchification algorithm
     #
@@ -2946,9 +2946,8 @@ END
     rmtree '.pc';
 
     runcmd @git, qw(add -Af .);
-    my $origtree=git_write_tree();
-
-    printdebug "fake orig tree object $origtree\n";
+    my $unapplied=git_write_tree();
+    printdebug "fake orig tree object $unapplied\n";
 
     ensuredir '.pc';
 
@@ -2968,7 +2967,7 @@ END
         rename '../fake/.pc','.pc' or die $!;
     }
 
-    quiltify($clogp,$headref,$origtree);
+    quiltify($clogp,$headref,$unapplied);
 
     if (!open P, '>>', ".pc/applied-patches") {
 	$!==&ENOENT or die $!;