diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 19:24:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-09 01:11:28 -0700 |
| commit | dba2e2037f40685bffc87d3e7114a02c5bda1eff (patch) | |
| tree | f5d2a9e6df86486e76f972327fd6596580851161 /unpack-trees.c | |
| parent | 1d8842d921cc2695f155f4a10904eeffad085c77 (diff) | |
| download | git-dba2e2037f40685bffc87d3e7114a02c5bda1eff.tar.gz git-dba2e2037f40685bffc87d3e7114a02c5bda1eff.tar.xz | |
Simplify read_directory[_recursive]() arguments
Stop the insanity with separate 'path' and 'base' arguments that must
match. We don't need that crazy interface any more, since we cleaned up
handling of 'path' in commit da4b3e8c28b1dc2b856d2555ac7bb47ab712598c.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 05d0bb1f8..42c7d7d56 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -551,7 +551,7 @@ static int verify_clean_subdirectory(struct cache_entry *ce, const char *action, memset(&d, 0, sizeof(d)); if (o->dir) d.exclude_per_dir = o->dir->exclude_per_dir; - i = read_directory(&d, ce->name, pathbuf, namelen+1, NULL); + i = read_directory(&d, pathbuf, namelen+1, NULL); if (i) return o->gently ? -1 : error(ERRORMSG(o, not_uptodate_dir), ce->name); |