[PATCH] git-ssh-pull: commit-id consistency

In contrast to other plumbing tools, git-ssh-push only
allow a very restrictive form of commit-id filenames.
This patch removes this restriction.

Acked-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/Documentation/git-ssh-push.txt b/Documentation/git-ssh-push.txt
index c55ce7dd6f7308f5057218a8ea412ac490844cb3..69013fd44a5b4cab09c93ebf530cbf05e3bc0574 100644 (file)
--- a/Documentation/git-ssh-push.txt
+++ b/Documentation/git-ssh-push.txt
@@ -20,7 +20,7 @@ git-ssh-pull, aside from which end you run it on.
 OPTIONS
 -------
 commit-id::
 OPTIONS
 -------
 commit-id::

-        Either the hash or the filename under $GIT_DIR/refs/ to push.
+        Id of commit to push.

 
 -c::
         Get the commit objects.
 
 -c::
         Get the commit objects.

diff --git a/ssh-push.c b/ssh-push.c
index 12fb9fccbf3e39b4e141ebc0d2d371df395785cf..db69c889e79da7afac3fc7791000fd31ec61adb5 100644 (file)
--- a/ssh-push.c
+++ b/ssh-push.c
@@ -2,6 +2,8 @@
 #include "rsh.h"
 #include "refs.h"
 
 #include "rsh.h"
 #include "refs.h"
 

+#include <string.h>
+

 unsigned char local_version = 1;
 unsigned char remote_version = 0;
 
 unsigned char local_version = 1;
 unsigned char remote_version = 0;
 


@@ -103,6 +105,9 @@ void service(int fd_in, int fd_out) {
        } while (1);
 }
 
        } while (1);
 }
 

+static const char *ssh_push_usage =
+       "git-ssh-push [-c] [-t] [-a] [-w ref] commit-id url";
+

 int main(int argc, char **argv)
 {
        int arg = 1;
 int main(int argc, char **argv)
 {
        int arg = 1;


@@ -110,18 +115,23 @@ int main(int argc, char **argv)
         char *url;
        int fd_in, fd_out;
        const char *prog = getenv("GIT_SSH_PULL") ? : "git-ssh-pull";
         char *url;
        int fd_in, fd_out;
        const char *prog = getenv("GIT_SSH_PULL") ? : "git-ssh-pull";

+       unsigned char sha1[20];
+       char hex[41];

 
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 'w')
                        arg++;
                 arg++;
         }
 
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 'w')
                        arg++;
                 arg++;
         }

-        if (argc < arg + 2) {
-               usage("git-ssh-push [-c] [-t] [-a] [-w ref] commit-id url");
-                return 1;
-        }
+       if (argc < arg + 2)
+               usage(ssh_push_usage);

        commit_id = argv[arg];
        url = argv[arg + 1];
        commit_id = argv[arg];
        url = argv[arg + 1];

+       if (get_sha1(commit_id, sha1))
+               usage(ssh_push_usage);
+       memcpy(hex, sha1_to_hex(sha1), sizeof(hex));
+       argv[arg] = hex;
+

        if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
                return 1;
 
        if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
                return 1;