diff options
| author | Martin Koegler <mkoegler@auto.tuwien.ac.at> | 2007-04-23 22:55:05 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 00:08:49 -0700 |
| commit | a0cd87a57044efa8aef39b476fd9240af57a1853 (patch) | |
| tree | 2a6ce33e0d2f29918b7bc2347282a47e2f9acb9b /sha1_name.c | |
| parent | 40689ae1ef9a05503c75298ec50b194ca9d15522 (diff) | |
| download | git-a0cd87a57044efa8aef39b476fd9240af57a1853.tar.gz | |
add get_sha1_with_mode
get_sha1_with_mode basically behaves as get_sha1. It has an additional
parameter for storing the mode of the object.
If the mode can not be determined, it stores S_IFINVALID.
Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sha1_name.c b/sha1_name.c index b0b12bbe9d..55f25a2d3b 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -643,11 +643,17 @@ static int get_sha1_oneline(const char *prefix, unsigned char *sha1) */ int get_sha1(const char *name, unsigned char *sha1) { - int ret, bracket_depth; unsigned unused; + return get_sha1_with_mode(name, sha1, &unused); +} + +int get_sha1_with_mode(const char *name, unsigned char *sha1, unsigned *mode) +{ + int ret, bracket_depth; int namelen = strlen(name); const char *cp; + *mode = S_IFINVALID; prepare_alt_odb(); ret = get_sha1_1(name, namelen, sha1); if (!ret) @@ -685,6 +691,7 @@ int get_sha1(const char *name, unsigned char *sha1) break; if (ce_stage(ce) == stage) { hashcpy(sha1, ce->sha1); + *mode = ntohl(ce->ce_mode); return 0; } pos++; @@ -703,7 +710,7 @@ int get_sha1(const char *name, unsigned char *sha1) unsigned char tree_sha1[20]; if (!get_sha1_1(name, cp-name, tree_sha1)) return get_tree_entry(tree_sha1, cp+1, sha1, - &unused); + mode); } return ret; } |