Skip to contentSkip to conversation

Use the empty tree for base diff in paranoid-update on new branches

PATCH In review Shawn O. Pearce 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 3/3 Use the empty tree for base diff in paranoid-update on new branches

We have to load a tree difference for the purpose of testing file patterns. But if our branch is being created and there is no specific base to difference against in the rule our base will be '0'x40. This is (usually) not a valid tree-ish object in a Git repository, so there's nothing to difference against.

Instead of creating the empty tree and running git-diff against that we just take the output of ls-tree -r --name-only and mark every returned pathname as an add.

---
 contrib/hooks/update-paranoid |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)
contrib/hooks/update-paranoid +21 -10
index 84ed452..068fa37 100644
@@ -223,20 +223,31 @@ sub load_diff ($) {
 	my $d = $diff_cache{$base};
 	unless ($d) {
 		local $/ = "\0";
-		open(T,'-|','git','diff-tree',
-			'-r','--name-status','-z',
-			$base,$new) or return undef;
 		my %this_diff;
-		while (<T>) {
-			my $op = $_;
-			chop $op;
+		if ($base =~ /^0{40}$/) {
+			open(T,'-|','git','ls-tree',
+				'-r','--name-only','-z',
+				$new) or return undef;
+			while (<T>) {
+				chop;
+				$this_diff{$_} = 'A';
+			}
+			close T or return undef;
+		} else {
+			open(T,'-|','git','diff-tree',
+				'-r','--name-status','-z',
+				$base,$new) or return undef;
+			while (<T>) {
+				my $op = $_;
+				chop $op;
 
-			my $path = <T>;
-			chop $path;
+				my $path = <T>;
+				chop $path;
 
-			$this_diff{$path} = $op;
+				$this_diff{$path} = $op;
+			}
+			close T or return undef;
 		}
-		close T or return undef;
 		$d = \%this_diff;
 		$diff_cache{$base} = $d;
 	}
Signature · 1 line
1.5.3.rc4.29.g74276