diff options
| author | Vicent Martà <tanoku@gmail.com> | 2012-05-05 14:22:06 -0700 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2012-05-05 14:22:06 -0700 |
| commit | 4ef14af93517b3842bc0dfa24147cf10dd029582 (patch) | |
| tree | 88f90fa8c9d903f072a2b1c647c51a9899e520c7 /src/odb_pack.c | |
| parent | f95e8cc07c85034f737872455fce2895186be19d (diff) | |
| parent | 282283acc65bab9de231a2b3dc489eb171d5f1cf (diff) | |
| download | libgit2-development-merge.tar.gz | |
Merge pull request #664 from arrbee/attrs-from-indexdevelopment-merge
Support git attrs from index (and bare repo)
Diffstat (limited to 'src/odb_pack.c')
| -rw-r--r-- | src/odb_pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/odb_pack.c b/src/odb_pack.c index 242200b4a..458f288d9 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -242,7 +242,7 @@ static int packfile_refresh_all(struct pack_backend *backend) return 0; if (p_stat(backend->pack_folder, &st) < 0 || !S_ISDIR(st.st_mode)) - return git_odb__error_notfound("failed to refresh packfiles"); + return git_odb__error_notfound("failed to refresh packfiles", NULL); if (st.st_mtime != backend->pack_folder_mtime) { git_buf path = GIT_BUF_INIT; @@ -288,7 +288,7 @@ static int pack_entry_find(struct git_pack_entry *e, struct pack_backend *backen } } - return git_odb__error_notfound("failed to find pack entry"); + return git_odb__error_notfound("failed to find pack entry", oid); } static int pack_entry_find_prefix( @@ -330,7 +330,7 @@ static int pack_entry_find_prefix( } if (!found) - return git_odb__error_notfound("failed to find pack entry"); + return git_odb__error_notfound("no matching pack entry for prefix", short_oid); else if (found > 1) return git_odb__error_ambiguous("found multiple pack entries"); else |