mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin-am: remove redirection to git-am.sh

Browse Source 
At the beginning of the rewrite of git-am.sh to C, in order to not break
existing test scripts that depended on a functional git-am, a
redirection to git-am.sh was introduced that would activate if the
environment variable _GIT_USE_BUILTIN_AM was not defined.

Now that all of git-am.sh's functionality has been re-implemented in
builtin/am.c, remove this redirection, and retire git-am.sh into
contrib/examples/.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Paul Tan
2015-08-04 21:52:06 +08:00
committed by Junio C Hamano
parent 5e4f9cff3c
commit 783d7e865e
4 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git.c
View File

@ -370,12 +370,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
static struct cmd_struct commands[] = {
{ "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
/*
* NEEDSWORK: Once the redirection to git-am.sh in builtin/am.c has
* been removed, this entry should be changed to
* RUN_SETUP | NEED_WORK_TREE
*/
{ "am", cmd_am },
{ "am", cmd_am, RUN_SETUP | NEED_WORK_TREE },
{ "annotate", cmd_annotate, RUN_SETUP },
{ "apply", cmd_apply, RUN_SETUP_GENTLY },
{ "archive", cmd_archive },