{"thread":{"id":"5092","subject":"[PATCH] Make git-prune-packed a builtin","startedAt":"2006-08-02T16:17:29Z","lastAt":"2006-08-02T16:32:32Z","messageCount":2,"participants":["Matthias Kestenholz"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"24565","messageId":"20060802161729.GE20971@spinlock.ch","threadId":"5092","inReplyTo":null,"subject":"[PATCH] Make git-prune-packed a builtin","fromName":"Matthias Kestenholz","fromEmail":"matthias@spinlock.ch","sentAt":"2006-08-02T16:17:29Z","receivedAt":"2006-08-02T16:17:29Z","isPatch":true,"sender":{"key":"matthias@spinlock.ch","avatar":"https://gravatar.com/avatar/bc18f396e70163d09ab458a341b1decb7e8b6ee3aa2c0c954ec20162e67c4d46?d=mp&s=160"},"body":"Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>\n---\n Makefile                                 |    6 +++---\n prune-packed.c => builtin-prune-packed.c |    2 +-\n builtin.h                                |    1 +\n git.c                                    |    1 +\n 4 files changed, 6 insertions(+), 4 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 2562a2c..e39c9da 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -196,7 +196,7 @@ PROGRAMS = \\\n \tgit-hash-object$X git-index-pack$X git-local-fetch$X \\\n \tgit-merge-base$X \\\n \tgit-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \\\n-\tgit-peek-remote$X git-prune-packed$X git-receive-pack$X \\\n+\tgit-peek-remote$X git-receive-pack$X \\\n \tgit-send-pack$X git-shell$X \\\n \tgit-show-index$X git-ssh-fetch$X \\\n \tgit-ssh-upload$X git-unpack-file$X \\\n@@ -216,7 +216,7 @@ BUILT_INS = git-log$X git-whatchanged$X \n \tgit-read-tree$X git-commit-tree$X git-write-tree$X \\\n \tgit-apply$X git-show-branch$X git-diff-files$X git-update-index$X \\\n \tgit-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \\\n-\tgit-fmt-merge-msg$X git-prune$X git-mv$X\n+\tgit-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X\n \n # what 'all' will build and 'install' will install, in gitexecdir\n ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)\n@@ -273,7 +273,7 @@ BUILTIN_OBJS = \\\n \tbuiltin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \\\n \tbuiltin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \\\n \tbuiltin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \\\n-\tbuiltin-mv.o\n+\tbuiltin-mv.o builtin-prune-packed.o\n \n GITLIBS = $(LIB_FILE) $(XDIFF_LIB)\n EXTLIBS = -lz\ndiff --git a/prune-packed.c b/builtin-prune-packed.c\nsimilarity index 96%\nrename from prune-packed.c\nrename to builtin-prune-packed.c\nindex d24b097..8ca8c8c 100644\n--- a/prune-packed.c\n+++ b/builtin-prune-packed.c\n@@ -54,7 +54,7 @@ static void prune_packed_objects(void)\n \t}\n }\n \n-int main(int argc, char **argv)\n+int cmd_prune_packed(int argc, char **argv, const char *prefix)\n {\n \tint i;\n \ndiff --git a/builtin.h b/builtin.h\nindex f10d3b7..7ddfe28 100644\n--- a/builtin.h\n+++ b/builtin.h\n@@ -20,6 +20,7 @@ extern int cmd_format_patch(int argc, co\n extern int cmd_count_objects(int argc, const char **argv, const char *prefix);\n \n extern int cmd_prune(int argc, const char **argv, const char *prefix);\n+extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);\n \n extern int cmd_push(int argc, const char **argv, const char *prefix);\n extern int cmd_grep(int argc, const char **argv, const char *prefix);\ndiff --git a/git.c b/git.c\nindex 110e82e..5b50762 100644\n--- a/git.c\n+++ b/git.c\n@@ -263,6 +263,7 @@ static void handle_internal_command(int \n \t\t{ \"fmt-merge-msg\", cmd_fmt_merge_msg, NEEDS_PREFIX },\n \t\t{ \"prune\", cmd_prune, NEEDS_PREFIX },\n \t\t{ \"mv\", cmd_mv, NEEDS_PREFIX },\n+\t\t{ \"prune-packed\", cmd_prune_packed, NEEDS_PREFIX },\n \t};\n \tint i;\n \n-- \n1.4.2.rc2.g767b2\n\n-- \nMatthias Kestenholz\nwww.spinlock.ch\n"},{"id":"24567","messageId":"20060802163232.GF20971@spinlock.ch","threadId":"5092","inReplyTo":"20060802161729.GE20971@spinlock.ch","subject":"[PATCH/corrected] Make git-prune-packed a builtin","fromName":"Matthias Kestenholz","fromEmail":"matthias@spinlock.ch","sentAt":"2006-08-02T16:32:32Z","receivedAt":"2006-08-02T16:32:32Z","isPatch":true,"sender":{"key":"matthias@spinlock.ch","avatar":"https://gravatar.com/avatar/bc18f396e70163d09ab458a341b1decb7e8b6ee3aa2c0c954ec20162e67c4d46?d=mp&s=160"},"body":"Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>\n---\n\n\n\nPlease discard the other patch. This one also removes the second call to\nsetup_git_directory()\n\nBtw. the NEEDS_PREFIX name in git.c confuses me. It should probably\nbe something like AUTO_SETUP_DIRECTORY ? It would be clearer what it\nmeans.\n\n\n\n Makefile                                 |    6 +++---\n prune-packed.c => builtin-prune-packed.c |    4 +---\n builtin.h                                |    1 +\n git.c                                    |    1 +\n 4 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 2562a2c..e39c9da 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -196,7 +196,7 @@ PROGRAMS = \\\n \tgit-hash-object$X git-index-pack$X git-local-fetch$X \\\n \tgit-merge-base$X \\\n \tgit-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \\\n-\tgit-peek-remote$X git-prune-packed$X git-receive-pack$X \\\n+\tgit-peek-remote$X git-receive-pack$X \\\n \tgit-send-pack$X git-shell$X \\\n \tgit-show-index$X git-ssh-fetch$X \\\n \tgit-ssh-upload$X git-unpack-file$X \\\n@@ -216,7 +216,7 @@ BUILT_INS = git-log$X git-whatchanged$X \n \tgit-read-tree$X git-commit-tree$X git-write-tree$X \\\n \tgit-apply$X git-show-branch$X git-diff-files$X git-update-index$X \\\n \tgit-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \\\n-\tgit-fmt-merge-msg$X git-prune$X git-mv$X\n+\tgit-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X\n \n # what 'all' will build and 'install' will install, in gitexecdir\n ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)\n@@ -273,7 +273,7 @@ BUILTIN_OBJS = \\\n \tbuiltin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \\\n \tbuiltin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \\\n \tbuiltin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \\\n-\tbuiltin-mv.o\n+\tbuiltin-mv.o builtin-prune-packed.o\n \n GITLIBS = $(LIB_FILE) $(XDIFF_LIB)\n EXTLIBS = -lz\ndiff --git a/prune-packed.c b/builtin-prune-packed.c\nsimilarity index 96%\nrename from prune-packed.c\nrename to builtin-prune-packed.c\nindex d24b097..d0ff336 100644\n--- a/prune-packed.c\n+++ b/builtin-prune-packed.c\n@@ -54,12 +54,10 @@ static void prune_packed_objects(void)\n \t}\n }\n \n-int main(int argc, char **argv)\n+int cmd_prune_packed(int argc, char **argv, const char *prefix)\n {\n \tint i;\n \n-\tsetup_git_directory();\n-\n \tfor (i = 1; i < argc; i++) {\n \t\tconst char *arg = argv[i];\n \ndiff --git a/builtin.h b/builtin.h\nindex f10d3b7..7ddfe28 100644\n--- a/builtin.h\n+++ b/builtin.h\n@@ -20,6 +20,7 @@ extern int cmd_format_patch(int argc, co\n extern int cmd_count_objects(int argc, const char **argv, const char *prefix);\n \n extern int cmd_prune(int argc, const char **argv, const char *prefix);\n+extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);\n \n extern int cmd_push(int argc, const char **argv, const char *prefix);\n extern int cmd_grep(int argc, const char **argv, const char *prefix);\ndiff --git a/git.c b/git.c\nindex 110e82e..5b50762 100644\n--- a/git.c\n+++ b/git.c\n@@ -263,6 +263,7 @@ static void handle_internal_command(int \n \t\t{ \"fmt-merge-msg\", cmd_fmt_merge_msg, NEEDS_PREFIX },\n \t\t{ \"prune\", cmd_prune, NEEDS_PREFIX },\n \t\t{ \"mv\", cmd_mv, NEEDS_PREFIX },\n+\t\t{ \"prune-packed\", cmd_prune_packed, NEEDS_PREFIX },\n \t};\n \tint i;\n \n-- \n1.4.2.rc2.ge3c5-dirty\n"}]}