[PATCH] rename --exec to --upload-pack for fetch-pack and peek-remote
From: Uwe Kleine-König <hidden>
Date: 2016-06-15 22:42:50
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Just some option name disambiguation. This is the counter part to commit d23842fd53e61f32c189a6ec902c4133abf29878 which made a similar change for push and send-pack. --exec continues to work. Signed-off-by: Uwe Kleine-König <redacted> --- Documentation/git-fetch-pack.txt | 7 +++++-- Documentation/git-peek-remote.txt | 7 +++++-- fetch-pack.c | 12 ++++++++---- peek-remote.c | 12 ++++++++---- 4 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt
index bd8ebac..105d76b 100644
--- a/Documentation/git-fetch-pack.txt
+++ b/Documentation/git-fetch-pack.txt@@ -8,7 +8,7 @@ git-fetch-pack - Receive missing objects from another repository SYNOPSIS -------- -'git-fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--exec=<git-upload-pack>] [--depth=<n>] [-v] [<host>:]<directory> [<refs>...] +'git-fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--upload-pack=<git-upload-pack>] [--depth=<n>] [-v] [<host>:]<directory> [<refs>...] DESCRIPTION -----------
@@ -45,7 +45,7 @@ OPTIONS Spend extra cycles to minimize the number of objects to be sent. Use it on slower connection. -\--exec=<git-upload-pack>:: +\--upload-pack=<git-upload-pack>:: Use this to specify the path to 'git-upload-pack' on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment
@@ -57,6 +57,9 @@ OPTIONS shells by having a lean .bashrc file (they set most of the things up in .bash_profile). +\--exec=<git-upload-pack>:: + Same as \--upload-pack=<git-upload-pack>. + \--depth=<n>:: Limit fetching to ancestor-chains not longer than n.
diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt
index ac57cda..74f37bd 100644
--- a/Documentation/git-peek-remote.txt
+++ b/Documentation/git-peek-remote.txt@@ -8,7 +8,7 @@ git-peek-remote - List the references in a remote repository SYNOPSIS -------- -'git-peek-remote' [--exec=<git-upload-pack>] [<host>:]<directory> +'git-peek-remote' [--upload-pack=<git-upload-pack>] [<host>:]<directory> DESCRIPTION -----------
@@ -17,7 +17,7 @@ stores them in the local repository under the same name. OPTIONS ------- ---exec=<git-upload-pack>:: +\--upload-pack=<git-upload-pack>:: Use this to specify the path to 'git-upload-pack' on the remote side, if it is not found on your $PATH. Some installations of sshd ignores the user's environment
@@ -29,6 +29,9 @@ OPTIONS shells, but prefer having a lean .bashrc file (they set most of the things up in .bash_profile). +\--exec=<git-upload-pack>:: + Same \--upload-pack=<git-upload-pack>. + <host>:: A remote host that houses the repository. When this part is specified, 'git-upload-pack' is invoked via
diff --git a/fetch-pack.c b/fetch-pack.c
index 726140a..3546aef 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)
diff --git a/peek-remote.c b/peek-remote.c
index 353da00..ef3c76c 100644
--- a/peek-remote.c
+++ b/peek-remote.c@@ -3,8 +3,8 @@ #include "pkt-line.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) {
@@ -35,8 +35,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("--tags", arg)) {
@@ -60,7 +64,7 @@ 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); if (pid < 0) return 1; ret = peek_remote(fd, flags);
--
1.5.0.rc1.g581a
--
Uwe Kleine-König
http://www.google.com/search?q=1+hertz+in+sec**-1