X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=peek-remote.c;h=ceb787170e17df130e26658e5a189bb63684ab3e;hb=f1eccbab638df66a7d8ec881f6f695514b26f44f;hp=2b30980b04e68a84bd300d647e80a34c7d3e621f;hpb=9673198ee867cea4ed70d2cf54c1a2eb8f27bb46;p=git.git

diff --git a/peek-remote.c b/peek-remote.c
index 2b30980b0..ceb787170 100644
--- a/peek-remote.c
+++ b/peek-remote.c
@@ -1,11 +1,10 @@
 #include "cache.h"
 #include "refs.h"
 #include "pkt-line.h"
-#include <sys/wait.h>
 
 static const char peek_remote_usage[] =
-"git-peek-remote [--exec=upload-pack] [host:]directory";
-static const char *exec = "git-upload-pack";
+"git-peek-remote [--upload-pack=<git-upload-pack>] [<host>:]<directory>";
+static const char *uploadpack = "git-upload-pack";
 
 static int peek_remote(int fd[2], unsigned flags)
 {
@@ -36,8 +35,12 @@ int main(int argc, char **argv)
 		char *arg = argv[i];
 
 		if (*arg == '-') {
-			if (!strncmp("--exec=", arg, 7)) {
-				exec = arg + 7;
+			if (!prefixcmp(arg, "--upload-pack=")) {
+				uploadpack = arg + 14;
+				continue;
+			}
+			if (!prefixcmp(arg, "--exec=")) {
+				uploadpack = arg + 7;
 				continue;
 			}
 			if (!strcmp("--tags", arg)) {
@@ -61,12 +64,12 @@ int main(int argc, char **argv)
 	if (!dest || i != argc - 1)
 		usage(peek_remote_usage);
 
-	pid = git_connect(fd, dest, exec);
+	pid = git_connect(fd, dest, uploadpack, 0);
 	if (pid < 0)
 		return 1;
 	ret = peek_remote(fd, flags);
 	close(fd[0]);
 	close(fd[1]);
-	finish_connect(pid);
-	return ret;
+	ret |= finish_connect(pid);
+	return !!ret;
 }