diff options
| author | Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> | 2007-01-23 09:20:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-24 16:12:15 -0800 |
| commit | 27dca07fb77f6f5851e3a8de54f86c803358caa4 (patch) | |
| tree | b278026c048e04a4a5f179de1b6444962b5020be /fetch-pack.c | |
| parent | 497171e765b7b4f903d21379bee050380e539cf3 (diff) | |
| download | git-27dca07fb77f6f5851e3a8de54f86c803358caa4.tar.gz git-27dca07fb77f6f5851e3a8de54f86c803358caa4.tar.xz | |
rename --exec to --upload-pack for fetch-pack and peek-remote
Just some option name disambiguation. This is the counter part to
commit d23842fd which made a similar change for push and send-pack.
--exec continues to work.
Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 726140a1a..3546aef7b 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -12,8 +12,8 @@ static int verbose; static int fetch_all; static int depth; static const char fetch_pack_usage[] = -"git-fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--exec=<git-upload-pack>] [--depth=<n>] [-v] [<host>:]<directory> [<refs>...]"; -static const char *exec = "git-upload-pack"; +"git-fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--upload-pack=<git-upload-pack>] [--depth=<n>] [-v] [<host>:]<directory> [<refs>...]"; +static const char *uploadpack = "git-upload-pack"; #define COMPLETE (1U << 0) #define COMMON (1U << 1) @@ -643,8 +643,12 @@ int main(int argc, char **argv) char *arg = argv[i]; if (*arg == '-') { + if (!strncmp("--upload-pack=", arg, 14)) { + uploadpack = arg + 14; + continue; + } if (!strncmp("--exec=", arg, 7)) { - exec = arg + 7; + uploadpack = arg + 7; continue; } if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) { @@ -682,7 +686,7 @@ int main(int argc, char **argv) } if (!dest) usage(fetch_pack_usage); - pid = git_connect(fd, dest, exec); + pid = git_connect(fd, dest, uploadpack); if (pid < 0) return 1; if (heads && nr_heads) |