Merge branch 'master' into cc/trace

diff --git a/ssh-upload.c b/ssh-upload.c
index 2da66618fcdd6a0f5af35c9f30554a65eb427427..20b15eab57e1c4f7c4b306010d7d12bff2308141 100644 (file)
--- a/ssh-upload.c
+++ b/ssh-upload.c
@@ -15,9 +15,9 @@
 #include <string.h>
 
 static unsigned char local_version = 1;
-static unsigned char remote_version = 0;
+static unsigned char remote_version;
 
-static int verbose = 0;
+static int verbose;
 
 static int serve_object(int fd_in, int fd_out) {
        ssize_t size;