From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Joey Hess <joey@kitenet.net>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v3 02/10] replace_object: don't check read_replace_refs twice
Date: Wed, 11 Dec 2013 08:46:05 +0100 [thread overview]
Message-ID: <20131211074614.11117.8923.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20131211074147.11117.1155.chriscool@tuxfamily.org>
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>
---
replace_object.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/replace_object.c b/replace_object.c
index d0b1548..cdcaf8c 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 */
--
1.8.5.1.102.g090758b
next prev parent reply other threads:[~2013-12-11 7:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-11 7:46 [PATCH v3 00/10] teach replace objects to sha1_object_info_extended() Christian Couder
2013-12-11 7:46 ` [PATCH v3 01/10] Rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT Christian Couder
2013-12-11 7:46 ` Christian Couder [this message]
2013-12-11 7:46 ` [PATCH v3 03/10] Introduce lookup_replace_object_extended() to pass flags Christian Couder
2013-12-11 7:46 ` [PATCH v3 04/10] Add an "unsigned flags" parameter to sha1_object_info_extended() Christian Couder
2013-12-11 7:46 ` [PATCH v3 05/10] t6050: show that git cat-file --batch fails with replace objects Christian Couder
2013-12-11 7:46 ` [PATCH v3 06/10] sha1_file: perform object replacement in sha1_object_info_extended() Christian Couder
2013-12-11 7:46 ` [PATCH v3 07/10] builtin/replace: teach listing using short, medium or full formats Christian Couder
2013-12-18 12:37 ` Karsten Blees
2013-12-18 16:49 ` Christian Couder
2013-12-18 17:37 ` Junio C Hamano
2013-12-19 16:36 ` Christian Couder
2013-12-19 18:58 ` Junio C Hamano
2013-12-21 9:34 ` Christian Couder
2013-12-26 19:10 ` Junio C Hamano
2013-12-28 10:27 ` Christian Couder
2013-12-11 7:46 ` [PATCH v3 08/10] t6050: add tests for listing with --format Christian Couder
2013-12-11 7:46 ` [PATCH v3 09/10] builtin/replace: unset read_replace_refs Christian Couder
2013-12-11 7:46 ` [PATCH v3 10/10] Documentation/git-replace: describe --format option Christian Couder
2013-12-12 20:05 ` [PATCH v3 00/10] teach replace objects to sha1_object_info_extended() Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131211074614.11117.8923.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=joey@kitenet.net \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).