@matheusbsbs / matheus-bagliano / commits / ff417260cf

make show-index a builtin

The git-show-index command is built as its own separate program. There's really no good reason for this, and it means we waste extra space on disk (and CPU time running the linker). Let's fold it in to the main binary as a builtin. The history here is actually a bit amusing. The program itself is mostly self-contained, and doesn't even use our normal pack index code. In a5031214c4 (slim down "git show-index", 2010-01-21), we even stopped using xmalloc() so that it could avoid libgit.a entirely. But then 040a655116 (cleanup: use internal memory allocation wrapper functions everywhere, 2011-10-06) switched that back to xmalloc, which later become ALLOC_ARRAY(). Making it a builtin should give us the best of both worlds: no wasted space and no need to avoid the usual patterns. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed May 28, 2018 at 05:38 UTC ff417260cf36a73b7cb39b40e6c81e5313e28b9b

4 files changed +5 -2

Makefile

+1 -1

@@ -642,7 +642,6 @@ PROGRAM_OBJS += http-backend.o

642 PROGRAM_OBJS += imap-send.o

643 PROGRAM_OBJS += sh-i18n--envsubst.o

644 PROGRAM_OBJS += shell.o

645 -PROGRAM_OBJS += show-index.o

645 PROGRAM_OBJS += upload-pack.o

646 PROGRAM_OBJS += remote-testsvn.o

647

@@ -1019,6 +1018,7 @@ BUILTIN_OBJS += builtin/rm.o

1018 BUILTIN_OBJS += builtin/send-pack.o

1019 BUILTIN_OBJS += builtin/shortlog.o

1020 BUILTIN_OBJS += builtin/show-branch.o

1021 +BUILTIN_OBJS += builtin/show-index.o

1022 BUILTIN_OBJS += builtin/show-ref.o

1023 BUILTIN_OBJS += builtin/stripspace.o

1024 BUILTIN_OBJS += builtin/submodule--helper.o

builtin.h

@@ -218,6 +218,7 @@ extern int cmd_send_pack(int argc, const char **argv, const char *prefix);

218 extern int cmd_shortlog(int argc, const char **argv, const char *prefix);

219 extern int cmd_show(int argc, const char **argv, const char *prefix);

220 extern int cmd_show_branch(int argc, const char **argv, const char *prefix);

221 +extern int cmd_show_index(int argc, const char **argv, const char *prefix);

222 extern int cmd_status(int argc, const char **argv, const char *prefix);

223 extern int cmd_stripspace(int argc, const char **argv, const char *prefix);

224 extern int cmd_submodule__helper(int argc, const char **argv, const char *prefix);

builtin/show-index.c renamed

+2 -1

@@ -1,10 +1,11 @@

1 +#include "builtin.h"

2 #include "cache.h"

3 #include "pack.h"

5 static const char show_index_usage[] =

6 "git show-index";

7 -int cmd_main(int argc, const char **argv)

8 +int cmd_show_index(int argc, const char **argv, const char *prefix)

9 {

10 int i;

11 unsigned nr;

git.c

@@ -464,6 +464,7 @@ static struct cmd_struct commands[] = {

464 { "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },

465 { "show", cmd_show, RUN_SETUP },

466 { "show-branch", cmd_show_branch, RUN_SETUP },

467 + { "show-index", cmd_show_index },

468 { "show-ref", cmd_show_ref, RUN_SETUP },

469 { "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },

470 { "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },