undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT

Browse Source 
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>
This commit is contained in:
Christian Couder 2013-12-11 08:46:04 +01:00 committed by Junio C Hamano
parent d2446dfd7f
commit ffe68cf9ac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cache.h
View File

@ -760,11 +760,11 @@ int daemon_avoid_alias(const char *path);
int offset_1st_component(const char *path); int offset_1st_component(const char *path);
/* object replacement */ /* object replacement */
#define READ_SHA1_FILE_REPLACE 1 #define LOOKUP_REPLACE_OBJECT 1
extern void *read_sha1_file_extended(const unsigned char *sha1, enum object_type *type, unsigned long *size, unsigned flag); extern void *read_sha1_file_extended(const unsigned char *sha1, enum object_type *type, unsigned long *size, unsigned flag);
static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size) static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
{ {
return read_sha1_file_extended(sha1, type, size, READ_SHA1_FILE_REPLACE); return read_sha1_file_extended(sha1, type, size, LOOKUP_REPLACE_OBJECT);
} }
extern const unsigned char *do_lookup_replace_object(const unsigned char *sha1); extern const unsigned char *do_lookup_replace_object(const unsigned char *sha1);
static inline const unsigned char *lookup_replace_object(const unsigned char *sha1) static inline const unsigned char *lookup_replace_object(const unsigned char *sha1)

2
sha1_file.c
View File

@ -2662,7 +2662,7 @@ void *read_sha1_file_extended(const unsigned char *sha1,
void *data; void *data;
char *path; char *path;
const struct packed_git *p; 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; ? lookup_replace_object(sha1) : sha1;
errno = 0; errno = 0;