mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
sha1_file: add repository argument to stat_sha1_file
Add a repository argument to allow the stat_sha1_file caller to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
cf78ae4f3d
commit
fbe33e2798
|
@ -867,8 +867,9 @@ int git_open_cloexec(const char *name, int flags)
|
|||
* Note that it may point to static storage and is only valid until another
|
||||
* call to sha1_file_name(), etc.
|
||||
*/
|
||||
static int stat_sha1_file(const unsigned char *sha1, struct stat *st,
|
||||
const char **path)
|
||||
#define stat_sha1_file(r, s, st, p) stat_sha1_file_##r(s, st, p)
|
||||
static int stat_sha1_file_the_repository(const unsigned char *sha1,
|
||||
struct stat *st, const char **path)
|
||||
{
|
||||
struct alternate_object_database *alt;
|
||||
static struct strbuf buf = STRBUF_INIT;
|
||||
|
@ -1174,7 +1175,7 @@ static int sha1_loose_object_info(const unsigned char *sha1,
|
|||
if (!oi->typep && !oi->typename && !oi->sizep && !oi->contentp) {
|
||||
const char *path;
|
||||
struct stat st;
|
||||
if (stat_sha1_file(sha1, &st, &path) < 0)
|
||||
if (stat_sha1_file(the_repository, sha1, &st, &path) < 0)
|
||||
return -1;
|
||||
if (oi->disk_sizep)
|
||||
*oi->disk_sizep = st.st_size;
|
||||
|
@ -1388,7 +1389,7 @@ void *read_sha1_file_extended(const unsigned char *sha1,
|
|||
die("replacement %s not found for %s",
|
||||
sha1_to_hex(repl), sha1_to_hex(sha1));
|
||||
|
||||
if (!stat_sha1_file(repl, &st, &path))
|
||||
if (!stat_sha1_file(the_repository, repl, &st, &path))
|
||||
die("loose object %s (stored in %s) is corrupt",
|
||||
sha1_to_hex(repl), path);
|
||||
|
||||
|
|
Loading…
Reference in a new issue