undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Shawn O. Pearce 2007-08-09 02:38:16 -04:00 committed by Junio C Hamano
parent d47eed3272
commit cabead982b
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
contrib/hooks/update-paranoid
View File

@ -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;
}