builtin-am: implement -i/--interactive

diff --git a/git.c b/git.c
index 55c327c7b3d2cd9cf9e0d52ddc5f83b34eeea75e..38d9ad531eb2c34a7ac02ced0e10cc13dbc37e0c 100644 (file)
--- a/git.c
+++ b/git.c
@@ -370,6 +370,12 @@ 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 },
        { "annotate", cmd_annotate, RUN_SETUP },
        { "apply", cmd_apply, RUN_SETUP_GENTLY },
        { "archive", cmd_archive },