aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-14 01:40:19 -0700
committerJunio C Hamano <junkio@cox.net>2007-03-14 01:40:19 -0700
commitc1f5086e23e97cdb8c913c10ff273e6cff913d52 (patch)
tree0e3ee9bae1a93256387d045d18082d182dcaa158 /Makefile
parent5a27b3211a37ca283738c3f114e8123393d1518a (diff)
parentf98ef68faf81f10f89d9168c21acae71dd50c69e (diff)
downloadgit-c1f5086e23e97cdb8c913c10ff273e6cff913d52.tar.gz
git-c1f5086e23e97cdb8c913c10ff273e6cff913d52.tar.xz
Merge branch 'jc/fetch'
* jc/fetch: .gitignore: add git-fetch--tool builtin-fetch--tool: fix reflog notes. git-fetch: retire update-local-ref which is not used anymore. builtin-fetch--tool: make sure not to overstep ls-remote-result buffer. fetch--tool: fix uninitialized buffer when reading from stdin builtin-fetch--tool: adjust to updated sha1_object_info(). git-fetch--tool takes flags before the subcommand. Use stdin reflist passing in git-fetch.sh Use stdin reflist passing in parse-remote Allow fetch--tool to read from stdin git-fetch: rewrite expand_ref_wildcard in C git-fetch: rewrite another shell loop in C git-fetch: move more code into C. git-fetch--tool: start rewriting parts of git-fetch in C. git-fetch: split fetch_main into fetch_dumb and fetch_native
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 45fe3663a..dc024d45c 100644
--- a/Makefile
+++ b/Makefile
@@ -293,6 +293,7 @@ BUILTIN_OBJS = \
builtin-diff-files.o \
builtin-diff-index.o \
builtin-diff-tree.o \
+ builtin-fetch--tool.o \
builtin-fmt-merge-msg.o \
builtin-for-each-ref.o \
builtin-fsck.o \