checkout -f failed to check out a file if an existing directory interfered.

[git.git] / ssh-fetch.c

diff --git a/ssh-fetch.c b/ssh-fetch.c
index 1e59cd2008d8089efef74b940d1a1094add7e687..28f7fd9174e8c48493983b17fa7b18cdecd41609 100644 (file)
--- a/ssh-fetch.c
+++ b/ssh-fetch.c
@@ -68,7 +68,7 @@ int fetch(unsigned char *sha1)
        struct object_list *temp;
 
        if (memcmp(sha1, in_transit->item->sha1, 20)) {
-               // we must have already fetched it to clean the queue
+               /* we must have already fetched it to clean the queue */
                return has_sha1_file(sha1) ? 0 : -1;
        }
        prefetches--;
@@ -85,7 +85,7 @@ int fetch(unsigned char *sha1)
                if (read(fd_in, &remote, 1) < 1)
                        return -1;
        }
-       //fprintf(stderr, "Got %d\n", remote);
+       /* fprintf(stderr, "Got %d\n", remote); */
        if (remote < 0)
                return remote;
        ret = write_sha1_from_fd(sha1, fd_in, conn_buf, 4096, &conn_buf_posn);