From: Christian Couder Date: Wed, 11 Dec 2013 07:46:05 +0000 (+0100) Subject: replace_object: don't check read_replace_refs twice X-Git-Tag: v1.9-rc0~41^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=500a04f196d90ef3a426ff63f76b44df479efc7d;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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 */