Re: Remove diff machinery dependency from read-cache
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Jan 22, 2010, 04:31 UTC
- Message-ID
- <alpine.LFD.2.00.1001212025270.13231@localhost.localdomain>
- In-Reply-To
- <alpine.LFD.2.00.1001212131230.1726@xanadu.home>
On Thu, 21 Jan 2010, Nicolas Pitre wrote:
> > So I really think that Linus' patch (which is missing hex.c btw) is a > good thing to do, even if only for the cleanup value.
Btw, it looks like the separate hex.c would fix not just git-show-index (together with de-xmalloc), but also make git-patch-id shrink down. Except git-patch-id for some reason does git_extract_argv0_path(), which brings in exec_cmd.o, which brings in strbuf, and xmalloc, and now it's all the same old pain again.
So rather than try to solve it all (xmalloc in particular is pretty hairy), here's another patch.
Linus --- Makefile | 2 +- patch-id.c => builtin-patch-id.c | 4 +--- builtin.h | 1 + git.c | 1 + 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile index 398b5fb..5b614e4 100644 --- a/Makefile +++ b/Makefile @@ -392,7 +392,6 @@ PROGRAMS += git-index-pack$X PROGRAMS += git-merge-index$X PROGRAMS += git-mktag$X PROGRAMS += git-pack-redundant$X -PROGRAMS += git-patch-id$X PROGRAMS += git-shell$X PROGRAMS += git-unpack-file$X PROGRAMS += git-upload-pack$X @@ -674,6 +673,7 @@ BUILTIN_OBJS += builtin-mv.o BUILTIN_OBJS += builtin-name-rev.o BUILTIN_OBJS += builtin-pack-objects.o BUILTIN_OBJS += builtin-pack-refs.o +BUILTIN_OBJS += builtin-patch-id.o BUILTIN_OBJS += builtin-prune-packed.o BUILTIN_OBJS += builtin-prune.o BUILTIN_OBJS += builtin-push.o diff --git a/patch-id.c b/builtin-patch-id.c similarity index 95% rename from patch-id.c rename to builtin-patch-id.c index 0df4cb0..af0911e 100644 --- a/patch-id.c +++ b/builtin-patch-id.c @@ -75,13 +75,11 @@ static void generate_id_list(void) static const char patch_id_usage[] = "git patch-id < patch"; -int main(int argc, char **argv) +int cmd_patch_id(int argc, const char **argv, const char *prefix) { if (argc != 1) usage(patch_id_usage); - git_extract_argv0_path(argv[0]); - generate_id_list(); return 0; } diff --git a/builtin.h b/builtin.h index 0c9c396..ab723f8 100644 --- a/builtin.h +++ b/builtin.h @@ -76,6 +76,7 @@ extern int cmd_mktree(int argc, const char **argv, const char *prefix); extern int cmd_mv(int argc, const char **argv, const char *prefix); extern int cmd_name_rev(int argc, const char **argv, const char *prefix); extern int cmd_pack_objects(int argc, const char **argv, const char *prefix); +extern int cmd_patch_id(int argc, const char **argv, const char *prefix); extern int cmd_pickaxe(int argc, const char **argv, const char *prefix); extern int cmd_prune(int argc, const char **argv, const char *prefix); extern int cmd_prune_packed(int argc, const char **argv, const char *prefix); diff --git a/git.c b/git.c index 09d3272..e38f201 100644 --- a/git.c +++ b/git.c @@ -341,6 +341,7 @@ static void handle_internal_command(int argc, const char **argv) { "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE }, { "name-rev", cmd_name_rev, RUN_SETUP }, { "pack-objects", cmd_pack_objects, RUN_SETUP }, + { "patch-id", cmd_patch_id }, { "peek-remote", cmd_ls_remote }, { "pickaxe", cmd_blame, RUN_SETUP }, { "prune", cmd_prune, RUN_SETUP },