summaryrefslogtreecommitdiff
path: root/ssh-upload.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-15 21:56:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-15 21:56:37 (GMT)
commitf71a69ab055c47056d0270b29b8f7455278c2422 (patch)
tree783a7ee17c193bb5baa6f8ebb87e6ce365ae13e6 /ssh-upload.c
parent0de68d28d34f915951324b9f387e6e67172e9951 (diff)
downloadgit-f71a69ab055c47056d0270b29b8f7455278c2422.zip
git-f71a69ab055c47056d0270b29b8f7455278c2422.tar.gz
git-f71a69ab055c47056d0270b29b8f7455278c2422.tar.bz2
Be more backward compatible with git-ssh-{push,pull}.
HPA reminded me that these programs knows about the name of the counterpart on the other end and simply symlinking the old name to new name locally would not be enough. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'ssh-upload.c')
-rw-r--r--ssh-upload.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/ssh-upload.c b/ssh-upload.c
index 10a3687..603abcc 100644
--- a/ssh-upload.c
+++ b/ssh-upload.c
@@ -1,3 +1,13 @@
+#ifndef COUNTERPART_ENV_NAME
+#define COUNTERPART_ENV_NAME "GIT_SSH_FETCH"
+#endif
+#ifndef COUNTERPART_PROGRAM_NAME
+#define COUNTERPART_PROGRAM_NAME "git-ssh-fetch"
+#endif
+#ifndef MY_PROGRAM_NAME
+#define MY_PROGRAM_NAME "git-ssh-upload"
+#endif
+
#include "cache.h"
#include "rsh.h"
#include "refs.h"
@@ -97,7 +107,7 @@ static void service(int fd_in, int fd_out) {
}
static const char ssh_push_usage[] =
- "git-ssh-upload [-c] [-t] [-a] [-w ref] commit-id url";
+ MY_PROGRAM_NAME " [-c] [-t] [-a] [-w ref] commit-id url";
int main(int argc, char **argv)
{
@@ -109,8 +119,8 @@ int main(int argc, char **argv)
unsigned char sha1[20];
char hex[41];
- prog = getenv("GIT_SSH_PULL");
- if (!prog) prog = "git-ssh-fetch";
+ prog = getenv(COUNTERPART_ENV_NAME);
+ if (!prog) prog = COUNTERPART_PROGRAM_NAME;
while (arg < argc && argv[arg][0] == '-') {
if (argv[arg][1] == 'w')
arg++;