Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
hash-object: cleanup handling of command line options
[gitweb.git]
/
unpack-trees.c
diff --git
a/unpack-trees.c
b/unpack-trees.c
index ff46fd62fdceeefc2ebd98ae1c9483964cb37bd5..ec558f9005fab372f9bf62d8c3df9ea34f5222bb 100644
(file)
--- a/
unpack-trees.c
+++ b/
unpack-trees.c
@@
-521,8
+521,9
@@
static void verify_absent(struct cache_entry *ce, const char *action,
if (!lstat(ce->name, &st)) {
int cnt;
+ int dtype = ce_to_dtype(ce);
- if (o->dir && excluded(o->dir, ce->name))
+ if (o->dir && excluded(o->dir, ce->name
, &dtype
))
/*
* ce->name is explicitly excluded, so it is Ok to
* overwrite it.