aboutsummaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-24 14:10:45 +0200
committerJunio C Hamano <junkio@cox.net>2006-07-25 14:15:46 -0700
commit4ab243a944a6013d9e862adadd6fe6152c842401 (patch)
tree526db06bb82543a777504d264f3e5f049369e00e /git.c
parent96256bba949f43548a0be0af877680eb62b156f6 (diff)
downloadgit-4ab243a944a6013d9e862adadd6fe6152c842401.tar.gz
git-4ab243a944a6013d9e862adadd6fe6152c842401.tar.xz
Allow an alias to start with "-p"
Now, something like [alias] pd = -p diff works as expected. [jc: a follow-up fix from Jeff King folded in.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git.c')
-rw-r--r--git.c36
1 files changed, 30 insertions, 6 deletions
diff --git a/git.c b/git.c
index ee5a0e86a..c0bd19d0e 100644
--- a/git.c
+++ b/git.c
@@ -35,6 +35,27 @@ static void prepend_to_path(const char *dir, int len)
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, const char ***argv)
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, const char ***argv)
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);
@@ -273,13 +298,12 @@ int main(int argc, const char **argv, char **envp)
/* 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;