X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=check-files.c;h=6fd69e79d6c253937498c553662ebe832a020449;hb=c742b813971a415fea6e623de4d9e45286a0a976;hp=c74bf87d2bfd2ad31e263254ce2ca69dabd31318;hpb=74b46e32cb3907a4a062a0f11de5773054b7c71a;p=git.git diff --git a/check-files.c b/check-files.c index c74bf87d..6fd69e79 100644 --- a/check-files.c +++ b/check-files.c @@ -18,22 +18,22 @@ static void check_file(const char *path) /* Nonexistent is fine */ if (fd < 0) { if (errno != ENOENT) - usage("%s: %s", path, strerror(errno)); + die("%s: %s", path, strerror(errno)); return; } /* Exists but is not in the cache is not fine */ pos = cache_name_pos(path, strlen(path)); if (pos < 0) - usage("preparing to update existing file '%s' not in cache", path); + die("preparing to update existing file '%s' not in cache", path); ce = active_cache[pos]; - if (fstat(fd, &st) < 0) - usage("fstat(%s): %s", path, strerror(errno)); + if (lstat(path, &st) < 0) + die("lstat(%s): %s", path, strerror(errno)); - changed = cache_match_stat(ce, &st); + changed = ce_match_stat(ce, &st); if (changed) - usage("preparing to update file '%s' not uptodate in cache", path); + die("preparing to update file '%s' not uptodate in cache", path); } int main(int argc, char **argv)