Merge fixes up to GIT 1.0.4

diff --git a/peek-remote.c b/peek-remote.c
index 4b1d0d5ba8ebb61c50a8766c73c6ba19e6efdef9..a90cf2206925ff51b7e8c799b22c8e6cb09c7fc2 100644 (file)
--- a/peek-remote.c
+++ b/peek-remote.c
@@ -11,7 +11,7 @@ static int peek_remote(int fd[2])
 {
        struct ref *ref;
 
-       get_remote_heads(fd[0], &ref, 0, NULL);
+       get_remote_heads(fd[0], &ref, 0, NULL, 0);
        packet_flush(fd[1]);
 
        while (ref) {
@@ -27,6 +27,9 @@ int main(int argc, char **argv)
        char *dest = NULL;
        int fd[2];
        pid_t pid;
+       int nongit = 0;
+
+       setup_git_directory_gently(&nongit);
 
        for (i = 1; i < argc; i++) {
                char *arg = argv[i];