With this rewriting, it is now possible to run e.g. `git -ad gui` to
start up git-gui in each repo within the current directory which
contains uncommited work.

Signed-off-by: Lars Hjemli <hje...@gmail.com>
---
 git.c                    | 36 +++++++++++++++++++++++++++
 t/t6400-for-each-repo.sh | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/git.c b/git.c
index 6b53169..f933b5d 100644
--- a/git.c
+++ b/git.c
@@ -31,8 +31,42 @@ static void commit_pager_choice(void) {
        }
 }
 
+/*
+ * Rewrite 'git -ad status' to 'git for-each-repo -d status'
+ */
+static int rewrite_foreach_repo(const char ***orig_argv,
+                               const char **curr_argv,
+                               int *curr_argc)
+{
+       const char **new_argv;
+       char *tmp;
+       int new_argc, curr_pos, i, j;
+
+       curr_pos = curr_argv - *orig_argv;
+       if (strlen(curr_argv[0]) == 2) {
+               curr_argv[0] = "for-each-repo";
+               return curr_pos - 1;
+       }
+
+       new_argc = curr_pos + *curr_argc + 1;
+       new_argv = xmalloc(new_argc * sizeof(void *));
+       for (i = j = 0; j < new_argc; i++, j++) {
+               if (i == curr_pos) {
+                       asprintf(&tmp, "-%s", (*orig_argv)[i] + 2);
+                       new_argv[j] = "for-each-repo";
+                       new_argv[++j] = tmp;
+               } else {
+                       new_argv[j] = (*orig_argv)[i];
+               }
+       }
+       *orig_argv = new_argv;
+       (*curr_argc)++;
+       return curr_pos;
+}
+
 static int handle_options(const char ***argv, int *argc, int *envchanged)
 {
+       const char ***pargv = argv;
        const char **orig_argv = *argv;
 
        while (*argc > 0) {
@@ -143,6 +177,8 @@ static int handle_options(const char ***argv, int *argc, 
int *envchanged)
                        setenv(GIT_LITERAL_PATHSPECS_ENVIRONMENT, "0", 1);
                        if (envchanged)
                                *envchanged = 1;
+               } else if (!strncmp(cmd, "-a", 2)) {
+                       return rewrite_foreach_repo(pargv, *argv, argc);
                } else {
                        fprintf(stderr, "Unknown option: %s\n", cmd);
                        usage(git_usage_string);
diff --git a/t/t6400-for-each-repo.sh b/t/t6400-for-each-repo.sh
index af02c0c..eaa4518 100755
--- a/t/t6400-for-each-repo.sh
+++ b/t/t6400-for-each-repo.sh
@@ -147,4 +147,67 @@ test_expect_success "-dx executes any command in dirty 
repos" '
        test_cmp expect actual
 '
 
+test_expect_success "rewrite 'git -a'" '
+       echo "." >expect &&
+       echo "clean" >>expect &&
+       echo "clean/gitfile" >>expect &&
+       echo "dirty-idx" >>expect &&
+       echo "dirty-wt" >>expect &&
+       echo "$qqname" >>expect &&
+       git -a >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success "rewrite 'git -az'" '
+       echo "(.)" >expect &&
+       echo "(clean)" >>expect &&
+       echo "(clean/gitfile)" >>expect &&
+       echo "(dirty-idx)" >>expect &&
+       echo "(dirty-wt)" >>expect &&
+       echo "($qname)" >>expect &&
+       git -az | xargs -0 printf "(%s)\n"  >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success "rewrite 'git -ad'" '
+       echo "clean/gitfile" >expect &&
+       echo "dirty-idx" >>expect &&
+       echo "dirty-wt" >>expect &&
+       git -ad >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success "rewrite 'git -ac'" '
+       echo "." >expect &&
+       echo "clean" >>expect &&
+       echo "$qqname" >>expect &&
+       git -ac >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success "rewrite 'git -a status -suno'" '
+       echo "[.]" >expect &&
+       echo "[clean]" >>expect &&
+       echo "[clean/gitfile]" >>expect &&
+       echo " M foo2.t" >>expect &&
+       echo "[dirty-idx]" >>expect &&
+       echo "D  foo3.t" >>expect &&
+       echo "[dirty-wt]" >>expect &&
+       echo " D foo4.t" >> expect
+       echo "[$qname]" >>expect &&
+       git -a status -suno >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success "rewrite 'git -acx pwd'" '
+       echo "[.]" >expect &&
+       echo "$HOME" >>expect &&
+       echo "[clean]" >>expect &&
+       echo "$HOME/clean" >>expect &&
+       echo "[$qname]" >>expect &&
+       echo "$HOME/$qname" >>expect &&
+       git -acx pwd >actual &&
+       test_cmp expect actual
+'
+
 test_done
-- 
1.8.1.1.349.g4cdd23e

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to