[PATCH] Allow an alias to start with "-p"
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:42:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-08-11 · [PATCH] Allow an alias to start with "-p" · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH] Allow an alias to start with "-p" · Junio C Hamano <hidden>
Now, something like [alias] pd = -p diff works as expected. Signed-off-by: Johannes Schindelin <redacted> --- On Sun, 23 Jul 2006, Junio C Hamano wrote:
Johannes Schindelin [off-list ref] writes:quoted
Now, something like [alias] pd = -p diff works as expected.I like what it wants to do but I am afraid this leads to an unmaintainable code (a micronit that already shows what I mean is that you can say "git --paginate diff", but you cannot say "pd = --paginate diff" in the configuration file). Is there a cleaner way to do it without duplicating the argument loop of git.c::main()?
This patch uses a better approach: instead of duplicating the option parsing of the git wrapper, it refactors the code into the new function handle_options(). In related news, this function would be the perfect candidate to set GIT_DIR without environment variables... git.c | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/git.c b/git.c
index ee5a0e8..8d7c644 100644
--- a/git.c
+++ b/git.c@@ -35,6 +35,27 @@ static void prepend_to_path(const char * setenv("PATH", path, 1); } +static int handle_options(const char*** argv, int* argc) +{ + int handled = 0; + + while (*argc > 0) { + const char *cmd = (*argv)[0]; + if (cmd[0] != '-') + break; + + if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) { + setup_pager(); + } else + die ("Unknown option: %s", cmd); + + (*argv)++; + (*argc)--; + handled++; + } + return handled; +} + static const char *alias_command; static char *alias_string = NULL;
@@ -106,7 +127,7 @@ static int handle_alias(int *argcp, cons subdir = setup_git_directory_gently(&nongit); if (!nongit) { - int count; + int count, option_count; const char** new_argv; alias_command = (*argv)[0];
@@ -114,6 +135,10 @@ static int handle_alias(int *argcp, cons if (alias_string) { count = split_cmdline(alias_string, &new_argv); + option_count = handle_options(&new_argv, &count); + memmove(new_argv - option_count, new_argv, + count * sizeof(char *)); + new_argv -= option_count; if (count < 1) die("empty alias for %s", alias_command);
@@ -264,6 +289,7 @@ int main(int argc, const char **argv, ch if (!strncmp(cmd, "git-", 4)) { cmd += 4; argv[0] = cmd; + handle_alias(&argc, &argv); handle_internal_command(argc, argv, envp); die("cannot handle %s internally", cmd); }
@@ -273,13 +299,12 @@ int main(int argc, const char **argv, ch /* Look for flags.. */ while (argc > 1) { - cmd = *++argv; + argv++; argc--; - if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) { - setup_pager(); - continue; - } + handle_options(&argv, &argc); + + cmd = *argv; if (strncmp(cmd, "--", 2)) break;