Merge git://repo.or.cz/git-gui

diff --git a/contrib/hooks/update-paranoid b/contrib/hooks/update-paranoid
index 84ed4524803b4662f2c1a0ff336bcfb1966d2c0d..d18b317b2f018d1d1a5a9677a7bdaf8956d65186 100644 (file)
--- a/contrib/hooks/update-paranoid
+++ b/contrib/hooks/update-paranoid
@@ -136,6 +136,7 @@ sub parse_config ($$$$) {
        local $ENV{GIT_DIR} = shift;
        my $br = shift;
        my $fn = shift;
+       return unless git_value('rev-list','--max-count=1',$br,'--',$fn);
        info "Loading $br:$fn";
        open(I,'-|','git','cat-file','blob',"$br:$fn");
        my $section = '';
@@ -223,20 +224,29 @@ 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}$/) {
+                       # 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',
+                               $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;
        }
@@ -249,6 +259,7 @@ deny "Refusing funny ref $ref" unless $ref =~ s,^refs/,,;
 deny "Bad old value $old" unless $old =~ /^[a-z0-9]{40}$/;
 deny "Bad new value $new" unless $new =~ /^[a-z0-9]{40}$/;
 deny "Cannot determine who you are." unless $this_user;
+grant "No change requested." if $old eq $new;
 
 $repository_name = File::Spec->rel2abs($git_dir);
 $repository_name =~ m,/([^/]+)(?:\.git|/\.git)$,;