git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 02/10] replace_object: don't check read_replace_refs twice

From
Christian Couder <chriscool@tuxfamily.org>
Date
Dec 28, 2013, 11:00 UTC
Message-ID
<20131228110016.2272.63916.chriscool@tuxfamily.org>
In-Reply-To
<20131228105505.2272.58873.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.4.1.616.g07f5c81
Previous: Christian CouderNext: Christian Couder
Message 3 of 13 in “teach replace objects to sha1_object_info_extended()”
  1. 00/10 teach replace objects to sha1_object_info_extended()Christian Couder, Dec 28, 2013
  2. 01/10 Rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECTChristian Couder, Dec 28, 2013
  3. 02/10 replace_object: don't check read_replace_refs twiceChristian Couder, Dec 28, 2013
  4. 03/10 Introduce lookup_replace_object_extended() to pass flagsChristian Couder, Dec 28, 2013
  5. 04/10 Add an "unsigned flags" parameter to sha1_object_info_extended()Christian Couder, Dec 28, 2013
  6. 05/10 t6050: show that git cat-file --batch fails with replace objectsChristian Couder, Dec 28, 2013
  7. 06/10 sha1_file: perform object replacement in sha1_object_info_extended()Christian Couder, Dec 28, 2013
  8. 07/10 builtin/replace: teach listing using short, medium or long formatsChristian Couder, Dec 28, 2013
  9. 08/10 t6050: add tests for listing with --formatChristian Couder, Dec 28, 2013
  10. 09/10 builtin/replace: unset read_replace_refsChristian Couder, Dec 28, 2013
  11. 10/10 Documentation/git-replace: describe --format optionChristian Couder, Dec 28, 2013
  12. Junio C HamanoDec 30, 2013
  13. Christian CouderDec 31, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.