@matheusbsbs / matheus-bagliano / commits / 73c2779f42

builtin-am: implement skeletal builtin am

For the purpose of rewriting git-am.sh into a C builtin, implement a skeletal builtin/am.c that redirects to $GIT_EXEC_PATH/git-am if the environment variable _GIT_USE_BUILTIN_AM is not defined. Since in the Makefile git-am.sh takes precedence over builtin/am.c, $GIT_EXEC_PATH/git-am will contain the shell script git-am.sh, and thus this allows us to fall back on the functional git-am.sh when running the test suite for tests that depend on a working git-am implementation. Since git-am.sh cannot handle any environment modifications by setup_git_directory(), "am" is declared with no setup flags in git.c. On the other hand, to re-implement git-am.sh in builtin/am.c, we need to run all the git dir and work tree setup logic that git.c typically does for us. As such, we work around this temporarily by copying the logic in git.c's run_builtin(), which is roughly: prefix = setup_git_directory(); trace_repo_setup(prefix); setup_work_tree(); This redirection should be removed when all the features of git-am.sh have been re-implemented in builtin/am.c. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Paul Tan committed Aug 4, 2015 at 21:51 UTC 73c2779f421fe1eaead6f1c07a0e134a9c17d6db
4 files changed +37
Makefile
+1
@@ -813,6 +813,7 @@ LIB_OBJS += xdiff-interface.o
813 LIB_OBJS += zlib.o
814
815 BUILTIN_OBJS += builtin/add.o
816 +BUILTIN_OBJS += builtin/am.o
817 BUILTIN_OBJS += builtin/annotate.o
818 BUILTIN_OBJS += builtin/apply.o
819 BUILTIN_OBJS += builtin/archive.o
builtin.h
+1
@@ -30,6 +30,7 @@ extern int textconv_object(const char *path, unsigned mode, const unsigned char
30 extern int is_builtin(const char *s);
31
32 extern int cmd_add(int argc, const char **argv, const char *prefix);
33 +extern int cmd_am(int argc, const char **argv, const char *prefix);
34 extern int cmd_annotate(int argc, const char **argv, const char *prefix);
35 extern int cmd_apply(int argc, const char **argv, const char *prefix);
36 extern int cmd_archive(int argc, const char **argv, const char *prefix);
builtin/am.c new
+29
@@ -0,0 +1,29 @@
1 +/*
2 + * Builtin "git am"
3 + *
4 + * Based on git-am.sh by Junio C Hamano.
5 + */
6 +#include "cache.h"
7 +#include "builtin.h"
8 +#include "exec_cmd.h"
9 +
10 +int cmd_am(int argc, const char **argv, const char *prefix)
11 +{
12 +
13 + /*
14 + * NEEDSWORK: Once all the features of git-am.sh have been
15 + * re-implemented in builtin/am.c, this preamble can be removed.
16 + */
17 + if (!getenv("_GIT_USE_BUILTIN_AM")) {
18 + const char *path = mkpath("%s/git-am", git_exec_path());
19 +
20 + if (sane_execvp(path, (char **)argv) < 0)
21 + die_errno("could not exec %s", path);
22 + } else {
23 + prefix = setup_git_directory();
24 + trace_repo_setup(prefix);
25 + setup_work_tree();
26 + }
27 +
28 + return 0;
29 +}
git.c
+6
@@ -370,6 +370,12 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
370
371 static struct cmd_struct commands[] = {
372 { "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
373 + /*
374 + * NEEDSWORK: Once the redirection to git-am.sh in builtin/am.c has
375 + * been removed, this entry should be changed to
376 + * RUN_SETUP | NEED_WORK_TREE
377 + */
378 + { "am", cmd_am },
379 { "annotate", cmd_annotate, RUN_SETUP },
380 { "apply", cmd_apply, RUN_SETUP_GENTLY },
381 { "archive", cmd_archive },