Skip to content

Commit

Permalink
Use the empty tree for base diff in paranoid-update on new branches
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Shawn O. Pearce authored and Junio C Hamano committed Aug 10, 2007
1 parent d47eed3 commit cabead9
Showing 1 changed file with 21 additions and 10 deletions.
31 changes: 21 additions & 10 deletions contrib/hooks/update-paranoid
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit cabead9

Please sign in to comment.