Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / build / git / hooks / update

diff --git a/build/git/hooks/update b/build/git/hooks/update
index aca1a7fe29255134e25a0a6c4f309ba2a0093b6a..01baae603d578d7c250b15bb6fbb893b5abf6fe4 100755 (executable)
--- a/build/git/hooks/update
+++ b/build/git/hooks/update
@@ -3,7 +3,6 @@
 # Called by git-receive-pack with arguments: refname sha1-old sha1-new
 #
 
 # Called by git-receive-pack with arguments: refname sha1-old sha1-new
 #
 

-#recipient="mj@ucw.cz"

 recipient="sherlock-commits@host2.netcentrum.cz"
 
 branch=${1#refs/heads/}
 recipient="sherlock-commits@host2.netcentrum.cz"
 
 branch=${1#refs/heads/}


@@ -41,7 +40,7 @@ else
        esac
        echo
        git-rev-list --pretty "$3" "^$base"
        esac
        echo
        git-rev-list --pretty "$3" "^$base"

-       git-diff "$base" "$3"
+       git-diff -C "$base" "$3"

        t=`mktemp -t gitlog.XXXXXXX`
        git-diff --name-only -r "$base" "$3" >$t
        while read X ; do
        t=`mktemp -t gitlog.XXXXXXX`
        git-diff --name-only -r "$base" "$3" >$t
        while read X ; do