Merge branch 'jc/no-slim-shell'

* jc/no-slim-shell:
  Revert "Build-in "git-shell""

4 files changed, 3 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 7a6cbb6f03..4c627fde13 100644
--- a/Makefile
+++ b/Makefile
@@ -549,7 +549,6 @@ BUILTIN_OBJS += builtin-rev-parse.o
 BUILTIN_OBJS += builtin-revert.o
 BUILTIN_OBJS += builtin-rm.o
 BUILTIN_OBJS += builtin-send-pack.o
-BUILTIN_OBJS += builtin-shell.o
 BUILTIN_OBJS += builtin-shortlog.o
 BUILTIN_OBJS += builtin-show-branch.o
 BUILTIN_OBJS += builtin-show-ref.o
@@ -832,6 +831,7 @@ EXTLIBS += -lz
 ifndef NO_POSIX_ONLY_PROGRAMS
 	PROGRAMS += git-daemon$X
 	PROGRAMS += git-imap-send$X
+	PROGRAMS += git-shell$X
 endif
 ifndef NO_OPENSSL
 	OPENSSL_LIBSSL = -lssl
diff --git a/builtin.h b/builtin.h
index 2b57a5eb6b..f3502d305e 100644
--- a/builtin.h
+++ b/builtin.h
@@ -88,7 +88,6 @@ extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
 extern int cmd_revert(int argc, const char **argv, const char *prefix);
 extern int cmd_rm(int argc, const char **argv, const char *prefix);
 extern int cmd_send_pack(int argc, const char **argv, const char *prefix);
-extern int cmd_shell(int argc, const char **argv, const char *prefix);
 extern int cmd_shortlog(int argc, const char **argv, const char *prefix);
 extern int cmd_show(int argc, const char **argv, const char *prefix);
 extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
diff --git a/git.c b/git.c
index 89e4645736..37b1d76a08 100644
--- a/git.c
+++ b/git.c
@@ -338,7 +338,6 @@ static void handle_internal_command(int argc, const char **argv)
 		{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
 		{ "rm", cmd_rm, RUN_SETUP },
 		{ "send-pack", cmd_send_pack, RUN_SETUP },
-		{ "shell", cmd_shell },
 		{ "shortlog", cmd_shortlog, USE_PAGER },
 		{ "show-branch", cmd_show_branch, RUN_SETUP },
 		{ "show", cmd_show, RUN_SETUP | USE_PAGER },
diff --git a/builtin-shell.c b/shell.c
index 3cf97d4f5d..0f6a727a8c 100644
--- a/builtin-shell.c
+++ b/shell.c
@@ -2,7 +2,6 @@
 #include "quote.h"
 #include "exec_cmd.h"
 #include "strbuf.h"
-#include "builtin.h"
 
 static int do_generic_cmd(const char *me, char *arg)
 {
@@ -45,7 +44,7 @@ static struct commands {
 	{ NULL },
 };
 
-int cmd_shell(int argc, const char **argv, const char *prefix)
+int main(int argc, char **argv)
 {
 	char *prog;
 	struct commands *cmd;
@@ -63,7 +62,7 @@ int cmd_shell(int argc, const char **argv, const char *prefix)
 	else if (argc != 3 || strcmp(argv[1], "-c"))
 		die("What do you think I am? A shell?");
 
-	prog = xstrdup(argv[2]);
+	prog = argv[2];
 	if (!strncmp(prog, "git", 3) && isspace(prog[3]))
 		/* Accept "git foo" as if the caller said "git-foo". */
 		prog[3] = '-';