Merge branch 'jc/no-slim-shell'
* jc/no-slim-shell: Build-in "git-shell" shell: do not play duplicated definition games to shrink the executable
This commit is contained in:
commit
837a156197
11
Makefile
11
Makefile
@ -336,7 +336,6 @@ endif
|
||||
export PERL_PATH
|
||||
|
||||
LIB_FILE=libgit.a
|
||||
COMPAT_LIB = compat/lib.a
|
||||
XDIFF_LIB=xdiff/lib.a
|
||||
|
||||
LIB_H += archive.h
|
||||
@ -550,6 +549,7 @@ 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,7 +832,6 @@ 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
|
||||
@ -1238,12 +1237,6 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
|
||||
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
|
||||
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
|
||||
|
||||
$(COMPAT_LIB): $(COMPAT_OBJS)
|
||||
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(COMPAT_OBJS)
|
||||
|
||||
git-shell$X: abspath.o ctype.o exec_cmd.o quote.o strbuf.o usage.o wrapper.o shell.o $(COMPAT_LIB)
|
||||
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(COMPAT_LIB)
|
||||
|
||||
$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
|
||||
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
|
||||
builtin-revert.o wt-status.o: wt-status.h
|
||||
@ -1456,7 +1449,7 @@ distclean: clean
|
||||
|
||||
clean:
|
||||
$(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
|
||||
$(LIB_FILE) $(XDIFF_LIB) $(COMPAT_LIB)
|
||||
$(LIB_FILE) $(XDIFF_LIB)
|
||||
$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
|
||||
$(RM) $(TEST_PROGRAMS)
|
||||
$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*
|
||||
|
@ -2,14 +2,7 @@
|
||||
#include "quote.h"
|
||||
#include "exec_cmd.h"
|
||||
#include "strbuf.h"
|
||||
|
||||
/* Stubs for functions that make no sense for git-shell. These stubs
|
||||
* are provided here to avoid linking in external redundant modules.
|
||||
*/
|
||||
void release_pack_memory(size_t need, int fd){}
|
||||
void trace_argv_printf(const char **argv, const char *fmt, ...){}
|
||||
void trace_printf(const char *fmt, ...){}
|
||||
|
||||
#include "builtin.h"
|
||||
|
||||
static int do_generic_cmd(const char *me, char *arg)
|
||||
{
|
||||
@ -52,7 +45,7 @@ static struct commands {
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
int main(int argc, char **argv)
|
||||
int cmd_shell(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
char *prog;
|
||||
struct commands *cmd;
|
||||
@ -70,7 +63,7 @@ int main(int argc, char **argv)
|
||||
else if (argc != 3 || strcmp(argv[1], "-c"))
|
||||
die("What do you think I am? A shell?");
|
||||
|
||||
prog = argv[2];
|
||||
prog = xstrdup(argv[2]);
|
||||
if (!strncmp(prog, "git", 3) && isspace(prog[3]))
|
||||
/* Accept "git foo" as if the caller said "git-foo". */
|
||||
prog[3] = '-';
|
@ -88,6 +88,7 @@ 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);
|
||||
|
1
git.c
1
git.c
@ -338,6 +338,7 @@ 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 },
|
||||
|
Loading…
Reference in New Issue
Block a user