summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorLukas Fleischer <git@cryptocrack.de>2013-04-13 15:28:30 +0200
committerJunio C Hamano <gitster@pobox.com>2013-04-17 09:49:11 -0700
commit29fb37b272debaf4f5f6eb7cf476de9274492930 (patch)
treeed6827f948d726bec9fadb0b0f292146e27a28a6 /read-cache.c
parent04a74b6cfa5ef4870263f84ac94a488d9f2ef14a (diff)
downloadgit-29fb37b272debaf4f5f6eb7cf476de9274492930.tar.gz
attr.c: extract read_index_data() as read_blob_data_from_index()
Extract the read_index_data() function from attr.c and move it to read-cache.c; rename it to read_blob_data_from_index() and update the function signature of it to align better with index/cache API functions. This allows for reusing the function in convert.c later. Signed-off-by: Lukas Fleischer <git@cryptocrack.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index b4d08254d6..48d87e83ed 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1895,3 +1895,35 @@ int index_name_is_other(const struct index_state *istate, const char *name,
}
return 1;
}
+
+void *read_blob_data_from_index(struct index_state *istate, const char *path)
+{
+ int pos, len;
+ unsigned long sz;
+ enum object_type type;
+ void *data;
+
+ len = strlen(path);
+ pos = index_name_pos(istate, path, len);
+ if (pos < 0) {
+ /*
+ * We might be in the middle of a merge, in which
+ * case we would read stage #2 (ours).
+ */
+ int i;
+ for (i = -pos - 1;
+ (pos < 0 && i < istate->cache_nr &&
+ !strcmp(istate->cache[i]->name, path));
+ i++)
+ if (ce_stage(istate->cache[i]) == 2)
+ pos = i;
+ }
+ if (pos < 0)
+ return NULL;
+ data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
+ if (!data || type != OBJ_BLOB) {
+ free(data);
+ return NULL;
+ }
+ return data;
+}