mirror of
https://github.com/git/git.git
synced 2024-11-06 01:03:02 +01:00
73c2779f42
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>
29 lines
626 B
C
29 lines
626 B
C
/*
|
|
* Builtin "git am"
|
|
*
|
|
* Based on git-am.sh by Junio C Hamano.
|
|
*/
|
|
#include "cache.h"
|
|
#include "builtin.h"
|
|
#include "exec_cmd.h"
|
|
|
|
int cmd_am(int argc, const char **argv, const char *prefix)
|
|
{
|
|
|
|
/*
|
|
* NEEDSWORK: Once all the features of git-am.sh have been
|
|
* re-implemented in builtin/am.c, this preamble can be removed.
|
|
*/
|
|
if (!getenv("_GIT_USE_BUILTIN_AM")) {
|
|
const char *path = mkpath("%s/git-am", git_exec_path());
|
|
|
|
if (sane_execvp(path, (char **)argv) < 0)
|
|
die_errno("could not exec %s", path);
|
|
} else {
|
|
prefix = setup_git_directory();
|
|
trace_repo_setup(prefix);
|
|
setup_work_tree();
|
|
}
|
|
|
|
return 0;
|
|
}
|