OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grep documentation: clarify what files match
[git-core/git.git]
/
cache-tree.c
diff --git
a/cache-tree.c
b/cache-tree.c
index
16a65df
..
d917437
100644
(file)
--- a/
cache-tree.c
+++ b/
cache-tree.c
@@
-329,7
+329,8
@@
static int update_one(struct cache_tree *it,
entlen = pathlen - baselen;
}
if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))
entlen = pathlen - baselen;
}
if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))
- return error("invalid object %s", sha1_to_hex(sha1));
+ return error("invalid object %06o %s for '%.*s'",
+ mode, sha1_to_hex(sha1), entlen+baselen, path);
if (ce->ce_flags & CE_REMOVE)
continue; /* entry being removed */
if (ce->ce_flags & CE_REMOVE)
continue; /* entry being removed */