git-pull-script: do the diffstat also for the fast-forward case

diff --git a/git-pull-script b/git-pull-script
index 9315426e7a79b4cb77852950764de317573de23e..44cb6d5a80e7259dc8f73a0770eb153b057f7371 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -4,6 +4,7 @@
 # just hard-codes it.
 #
 merge_repo=$1
+merge_name=${2:-HEAD}
 
 rm -f .git/MERGE_HEAD .git/ORIG_HEAD
 cp .git/HEAD .git/ORIG_HEAD
@@ -11,8 +12,8 @@ cp .git/HEAD .git/ORIG_HEAD
 echo "Getting object database"
 rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
 
-echo "Getting remote head"
-rsync -L $merge_repo/HEAD .git/MERGE_HEAD || exit 1
+echo "Getting remote $merge_name"
+rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
 
 head=$(cat .git/HEAD)
 merge_head=$(cat .git/MERGE_HEAD)
@@ -38,6 +39,7 @@ if [ "$common" == "$head" ]; then
        sleep 3
        git-read-tree -m $merge_tree && git-checkout-cache -f -a && git-update-cache --refresh
        echo $merge_head > .git/HEAD
+       git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
        exit 0
 fi
 echo "Trying to merge $merge_head into $head"