diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:49 -0700 |
| commit | 7ecc9b153c89aeec7470256f7b121fd845101b57 (patch) | |
| tree | 0bf662b5dd1ffe642756f5cb168902a89b60506a /cache-tree.c | |
| parent | c9c3c6781c5b97c37b3ce16af7ea9bc613413c7e (diff) | |
| parent | 5dc36a5888a7063ff4536c9ea50eb0557bfef627 (diff) | |
| download | git-7ecc9b153c89aeec7470256f7b121fd845101b57.tar.gz git-7ecc9b153c89aeec7470256f7b121fd845101b57.tar.xz | |
Merge branch 'maint' into jc/verify-pack-stat
* maint: (95 commits)
verify-pack -v: do not report "chain length 0"
t5510: harden the way verify-pack is used
gitweb/README: Document $base_url
Documentation: git submodule: add missing options to synopsis
Better usage string for reflog.
hg-to-git: don't import the unused popen2 module
send-email: remove debug trace
config: Keep inner whitespace verbatim
GIT 1.6.4
GIT 1.6.3.4
config.txt: document add.ignore-errors
request-pull: allow ls-remote to notice remote.$nickname.uploadpack
Update the documentation of the raw diff output format
git-rerere.txt: Clarify ambiguity of the config variable
t9143: do not fail if Compress::Zlib is missing
Trivial path quoting fixes in git-instaweb
GIT 1.6.4-rc3
Documentation/config.txt: a variable can be defined on the section header line
git svn: make minimize URL more reliable over http(s)
Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
...
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cache-tree.c b/cache-tree.c index 16a65dfac..d91743775 100644 --- 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)) - 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 */ |