aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-18 13:49:56 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-18 13:49:57 -0700
commitdec034a34e3887beaea9a7a390fd950346806c1e (patch)
tree770f9796d19bf337c1a0a42aadb7f1d046e1cd5d /Makefile
parentf94a84c408babe92f951050a69e23df537302e54 (diff)
parent0b63c6a5b78f3fdd8c4e4fed4e535e7f4eed4257 (diff)
downloadgit-dec034a34e3887beaea9a7a390fd950346806c1e.tar.gz
git-dec034a34e3887beaea9a7a390fd950346806c1e.tar.xz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4fde227f1..af847f846 100644
--- a/Makefile
+++ b/Makefile
@@ -461,7 +461,6 @@ SCRIPT_SH += git-pull.sh
SCRIPT_SH += git-quiltimport.sh
SCRIPT_SH += git-rebase.sh
SCRIPT_SH += git-remote-testgit.sh
-SCRIPT_SH += git-repack.sh
SCRIPT_SH += git-request-pull.sh
SCRIPT_SH += git-stash.sh
SCRIPT_SH += git-submodule.sh
@@ -969,6 +968,7 @@ BUILTIN_OBJS += builtin/reflog.o
BUILTIN_OBJS += builtin/remote.o
BUILTIN_OBJS += builtin/remote-ext.o
BUILTIN_OBJS += builtin/remote-fd.o
+BUILTIN_OBJS += builtin/repack.o
BUILTIN_OBJS += builtin/replace.o
BUILTIN_OBJS += builtin/rerere.o
BUILTIN_OBJS += builtin/reset.o