diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2008-05-25 22:17:57 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-05-25 20:29:30 -0700 |
| commit | 97561fff3263add59ec25207a0c5a635b28ce9b9 (patch) | |
| tree | c1dff2b66a00242996416d163840e6aa0b7bc252 /contrib | |
| parent | log --pretty: do not accept bogus "--prettyshort" (diff) | |
| download | tgif-97561fff3263add59ec25207a0c5a635b28ce9b9.tar.xz | |
Don't diff empty tree on branch creation in paranoid update hook
Listing all files in a branch during branch creation is silly;
the user's file-level ACLs probably don't mean anything at this
point. We now treat the base case of 0{40} as an empty diff,
as this happens only when the user is creating the branch and
there are file level ACLs that diff against the old value of
the branch.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/hooks/update-paranoid | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/contrib/hooks/update-paranoid b/contrib/hooks/update-paranoid index 068fa37083..6e0d97c89f 100644 --- a/contrib/hooks/update-paranoid +++ b/contrib/hooks/update-paranoid @@ -225,14 +225,12 @@ sub load_diff ($) { local $/ = "\0"; my %this_diff; 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; + # Don't load the diff at all; we are making the + # branch and have no base to compare to in this + # case. A file level ACL makes no sense in this + # context. Having an empty diff will allow the + # branch creation. + # } else { open(T,'-|','git','diff-tree', '-r','--name-status','-z', |