Skip to content

Commit dec034a

Browse files
committed
Merge branch 'sb/repack-in-c'
Rewrite "git repack" in C. * sb/repack-in-c: repack: improve warnings about failure of renaming and removing files repack: retain the return value of pack-objects repack: rewrite the shell script in C
2 parents f94a84c + 0b63c6a commit dec034a

File tree

5 files changed

+391
-1
lines changed

5 files changed

+391
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@ SCRIPT_SH += git-pull.sh
461461
SCRIPT_SH += git-quiltimport.sh
462462
SCRIPT_SH += git-rebase.sh
463463
SCRIPT_SH += git-remote-testgit.sh
464-
SCRIPT_SH += git-repack.sh
465464
SCRIPT_SH += git-request-pull.sh
466465
SCRIPT_SH += git-stash.sh
467466
SCRIPT_SH += git-submodule.sh
@@ -969,6 +968,7 @@ BUILTIN_OBJS += builtin/reflog.o
969968
BUILTIN_OBJS += builtin/remote.o
970969
BUILTIN_OBJS += builtin/remote-ext.o
971970
BUILTIN_OBJS += builtin/remote-fd.o
971+
BUILTIN_OBJS += builtin/repack.o
972972
BUILTIN_OBJS += builtin/replace.o
973973
BUILTIN_OBJS += builtin/rerere.o
974974
BUILTIN_OBJS += builtin/reset.o

builtin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ extern int cmd_reflog(int argc, const char **argv, const char *prefix);
102102
extern int cmd_remote(int argc, const char **argv, const char *prefix);
103103
extern int cmd_remote_ext(int argc, const char **argv, const char *prefix);
104104
extern int cmd_remote_fd(int argc, const char **argv, const char *prefix);
105+
extern int cmd_repack(int argc, const char **argv, const char *prefix);
105106
extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
106107
extern int cmd_rerere(int argc, const char **argv, const char *prefix);
107108
extern int cmd_reset(int argc, const char **argv, const char *prefix);

0 commit comments

Comments
 (0)