diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-08-04 21:52:06 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-04 22:02:11 -0700 |
| commit | 783d7e865ec8f6190f8d3abe3ab72a9410d611f1 (patch) | |
| tree | d7b0cebabb0f8ca55b43f0491f51ff2d61be8580 /git.c | |
| parent | 5e4f9cff3cf2c6398f7abbbb0631dde8063a6fdc (diff) | |
| download | git-783d7e865ec8f6190f8d3abe3ab72a9410d611f1.tar.gz git-783d7e865ec8f6190f8d3abe3ab72a9410d611f1.tar.xz | |
builtin-am: remove redirection to git-am.sh
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>
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -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 }, |