summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2013-12-11 08:46:04 +0100
committerJunio C Hamano <gitster@pobox.com>2013-12-12 11:53:48 -0800
commitffe68cf9acf1127078b0dfa0b09661ce52916642 (patch)
tree63662f331486c9695c6cddc9d78e60723635182c /sha1_file.c
parentd2446dfd7f3b3f8948142cfb07a0270e2497d93f (diff)
downloadgit-ffe68cf9acf1127078b0dfa0b09661ce52916642.tar.gz
rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT
The READ_SHA1_FILE_REPLACE flag is more related to using the lookup_replace_object() function rather than the read_sha1_file() function. We also need such a flag to be used with sha1_object_info() instead of read_sha1_file(). The name LOOKUP_REPLACE_OBJECT is therefore better for this flag. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 7dadd04cb7..2bd3acfc73 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2662,7 +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 & READ_SHA1_FILE_REPLACE)
+ const unsigned char *repl = (flag & LOOKUP_REPLACE_OBJECT)
? lookup_replace_object(sha1) : sha1;
errno = 0;