summaryrefslogtreecommitdiff
path: root/replace_object.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2013-12-11 08:46:05 +0100
committerJunio C Hamano <gitster@pobox.com>2013-12-12 11:53:48 -0800
commit500a04f196d90ef3a426ff63f76b44df479efc7d (patch)
tree905250d9dc540957a1c2197da0f83b3b07899b38 /replace_object.c
parentffe68cf9acf1127078b0dfa0b09661ce52916642 (diff)
downloadgit-500a04f196d90ef3a426ff63f76b44df479efc7d.tar.gz
replace_object: don't check read_replace_refs twice
Since e1111cef (inline lookup_replace_object() calls, May 15 2011) the read_replace_refs global variable is checked twice, once in lookup_replace_object() and once again in do_lookup_replace_object(). As do_lookup_replace_object() is called only from lookup_replace_object(), we can remove the check in do_lookup_replace_object(). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'replace_object.c')
-rw-r--r--replace_object.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/replace_object.c b/replace_object.c
index d0b1548726..cdcaf8cbe2 100644
--- a/replace_object.c
+++ b/replace_object.c
@@ -97,9 +97,6 @@ const unsigned char *do_lookup_replace_object(const unsigned char *sha1)
int pos, depth = MAXREPLACEDEPTH;
const unsigned char *cur = sha1;
- if (!read_replace_refs)
- return sha1;
-
prepare_replace_object();
/* Try to recursively replace the object */