X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=replace_object.c;h=d0b1548726e9d2362d27c6947eb61a0647d0eac2;hb=f3500825257b441134bd99b08bab3b6fd1cb4f51;hp=eb59604fd39e2beaf7d43802499c27305ac92132;hpb=03f94ae9f909952ed5a78917ab319a312889354b;p=git.git

diff --git a/replace_object.c b/replace_object.c
index eb59604fd..d0b154872 100644
--- a/replace_object.c
+++ b/replace_object.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "sha1-lookup.h"
 #include "refs.h"
+#include "commit.h"
 
 static struct replace_object {
 	unsigned char sha1[2][20];
@@ -84,12 +85,14 @@ static void prepare_replace_object(void)
 
 	for_each_replace_ref(register_replace_ref, NULL);
 	replace_object_prepared = 1;
+	if (!replace_object_nr)
+		read_replace_refs = 0;
 }
 
 /* We allow "recursive" replacement. Only within reason, though */
 #define MAXREPLACEDEPTH 5
 
-const unsigned char *lookup_replace_object(const unsigned char *sha1)
+const unsigned char *do_lookup_replace_object(const unsigned char *sha1)
 {
 	int pos, depth = MAXREPLACEDEPTH;
 	const unsigned char *cur = sha1;