diff options
| author | Brandon Williams <bmwill@google.com> | 2017-05-05 12:53:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-06 19:15:39 +0900 |
| commit | a0bba65b107651946431bee4c71d05d812988d9d (patch) | |
| tree | 2fdf86ac431244039da96a9d46127b073ff8d6f6 /unpack-trees.c | |
| parent | e799ed408eb59ca631c4908ba4236cd146ff6bd2 (diff) | |
| download | git-a0bba65b107651946431bee4c71d05d812988d9d.tar.gz | |
dir: convert is_excluded to take an index
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index f278cd23f0..d5b401450f 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1634,7 +1634,7 @@ static int check_ok_to_remove(const char *name, int len, int dtype, return 0; if (o->dir && - is_excluded(o->dir, name, &dtype)) + is_excluded(o->dir, &the_index, name, &dtype)) /* * ce->name is explicitly excluded, so it is Ok to * overwrite it. |