receive-pack: make it a builtin
It is a good thing to do in general, but more importantly, transport routines can only be used by built-ins, which is what I'll be adding next. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 9, 2008 at 01:27 UTC
be5908aed35d1c129f1ea38913b230ee1927361b
4 files changed
+6
-4
Makefile
+1
-1
@@ -294,7 +294,6 @@ PROGRAMS += git-mktag$X
294
PROGRAMS += git-mktree$X
295
PROGRAMS += git-pack-redundant$X
296
PROGRAMS += git-patch-id$X
297
-PROGRAMS += git-receive-pack$X
297
PROGRAMS += git-send-pack$X
298
PROGRAMS += git-shell$X
299
PROGRAMS += git-show-index$X
@@ -546,6 +545,7 @@ BUILTIN_OBJS += builtin-prune-packed.o
545
BUILTIN_OBJS += builtin-prune.o
546
BUILTIN_OBJS += builtin-push.o
547
BUILTIN_OBJS += builtin-read-tree.o
548
+BUILTIN_OBJS += builtin-receive-pack.o
549
BUILTIN_OBJS += builtin-reflog.o
550
BUILTIN_OBJS += builtin-remote.o
551
BUILTIN_OBJS += builtin-rerere.o
builtin-receive-pack.c
renamed
+3
-3
@@ -462,14 +462,14 @@ static int delete_only(struct command *cmd)
462
return 1;
463
}
464
465
-int main(int argc, char **argv)
465
+int cmd_receive_pack(int argc, const char **argv, const char *prefix)
466
{
467
int i;
468
char *dir = NULL;
469
470
argv++;
471
for (i = 1; i < argc; i++) {
472
- char *arg = *argv++;
472
+ const char *arg = *argv++;
473
474
if (*arg == '-') {
475
/* Do flag handling here */
@@ -477,7 +477,7 @@ int main(int argc, char **argv)
477
}
478
if (dir)
479
usage(receive_pack_usage);
480
- dir = arg;
480
+ dir = xstrdup(arg);
481
}
482
if (!dir)
483
usage(receive_pack_usage);
builtin.h
+1
@@ -78,6 +78,7 @@ extern int cmd_prune(int argc, const char **argv, const char *prefix);
78
extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
79
extern int cmd_push(int argc, const char **argv, const char *prefix);
80
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
81
+extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
82
extern int cmd_reflog(int argc, const char **argv, const char *prefix);
83
extern int cmd_remote(int argc, const char **argv, const char *prefix);
84
extern int cmd_config(int argc, const char **argv, const char *prefix);
git.c
+1
@@ -328,6 +328,7 @@ static void handle_internal_command(int argc, const char **argv)
328
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
329
{ "push", cmd_push, RUN_SETUP },
330
{ "read-tree", cmd_read_tree, RUN_SETUP },
331
+ { "receive-pack", cmd_receive_pack },
332
{ "reflog", cmd_reflog, RUN_SETUP },
333
{ "remote", cmd_remote, RUN_SETUP },
334
{ "repo-config", cmd_config },