summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2013-12-11 08:46:06 +0100
committerJunio C Hamano <gitster@pobox.com>2013-12-12 11:53:48 -0800
commitbf93eea0f67082ec295ac60fa78986f339adf2c6 (patch)
tree8fafdbbbae96efdc2136cbeb10e517ba19fbd91a /sha1_file.c
parent500a04f196d90ef3a426ff63f76b44df479efc7d (diff)
downloadgit-bf93eea0f67082ec295ac60fa78986f339adf2c6.tar.gz
sha1_file.c: add lookup_replace_object_extended() to pass flags
Currently, there is only one caller to lookup_replace_object() that can benefit from passing it some flags, but we expect that there could be more. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 2bd3acfc73..b0a39649bf 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2662,8 +2662,7 @@ void *read_sha1_file_extended(const unsigned char *sha1,
void *data;
char *path;
const struct packed_git *p;
- const unsigned char *repl = (flag & LOOKUP_REPLACE_OBJECT)
- ? lookup_replace_object(sha1) : sha1;
+ const unsigned char *repl = lookup_replace_object_extended(sha1, flag);
errno = 0;
data = read_object(repl, type, size);