aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2009-01-23 10:06:53 +0100
committerJunio C Hamano <gitster@pobox.com>2009-05-31 17:02:59 -0700
commit680955702990c1d4bfb3c6feed6ae9c6cb5c3c07 (patch)
tree44ee65b637c621cafc717ef76f1c196bcf28f17c /Makefile
parent292687003abcfb68d296c57d7e812b0469f74647 (diff)
downloadgit-680955702990c1d4bfb3c6feed6ae9c6cb5c3c07.tar.gz
git-680955702990c1d4bfb3c6feed6ae9c6cb5c3c07.tar.xz
replace_object: add mechanism to replace objects found in "refs/replace/"
The code implementing this mechanism has been copied more-or-less from the commit graft code. This mechanism is used in "read_sha1_file". sha1 passed to this function that match a ref name in "refs/replace/" are replaced by the sha1 that has been read in the ref. We "die" if the replacement recursion depth is too high or if we can't read the replacement object. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0ab1cff30..eaea65cc6 100644
--- a/Makefile
+++ b/Makefile
@@ -512,6 +512,7 @@ LIB_OBJS += read-cache.o
LIB_OBJS += reflog-walk.o
LIB_OBJS += refs.o
LIB_OBJS += remote.o
+LIB_OBJS += replace_object.o
LIB_OBJS += rerere.o
LIB_OBJS += revision.o
LIB_OBJS += run-command.o