projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation: Document signature showing options
[git.git]
/
unpack-trees.c
diff --git
a/unpack-trees.c
b/unpack-trees.c
index 33a581924e11167dc546bdf97c8d49460b43674e..6d9636623a2cbb5d5a38eb58d625ef0164d953c0 100644
(file)
--- a/
unpack-trees.c
+++ b/
unpack-trees.c
@@
-539,7
+539,8
@@
static struct cache_entry *create_ce_entry(const struct traverse_info *info, con
struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
ce->ce_mode = create_ce_mode(n->mode);
struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
ce->ce_mode = create_ce_mode(n->mode);
- ce->ce_flags = create_ce_flags(len, stage);
+ ce->ce_flags = create_ce_flags(stage);
+ ce->ce_namelen = len;
hashcpy(ce->sha1, n->sha1);
make_traverse_path(ce->name, info, n);
hashcpy(ce->sha1, n->sha1);
make_traverse_path(ce->name, info, n);
@@
-1296,7
+1297,7
@@
static int verify_clean_subdirectory(struct cache_entry *ce,
* First let's make sure we do not have a local modification
* in that directory.
*/
* First let's make sure we do not have a local modification
* in that directory.
*/
- namelen =
strlen(ce->nam
e);
+ namelen =
ce_namelen(c
e);
for (i = locate_in_src_index(ce, o);
i < o->src_index->cache_nr;
i++) {
for (i = locate_in_src_index(ce, o);
i < o->src_index->cache_nr;
i++) {