Enable minimal stat checking

Specifically the fields uid, gid, ctime, ino and dev are set to zero
by JGit. Other implementations, eg. Git in cygwin are allegedly also
somewhat incompatible with Git For Windows and on *nix platforms
the resolution of the timestamps may differ.

Any stat checking by git will then need to check content, which may
be very slow, particularly on Windows. Since mtime and size
is typically enough we should allow the user to tell git to avoid
checking these fields if they are set to zero in the index.

This change introduces a core.checkstat config option where the
the user can select to check all fields (default), or just size
and the whole second part of mtime (minimal).

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Robin Rosenberg 2013-01-22 08:49:22 +01:00 committed by Junio C Hamano
parent e9abef6289
commit c08e4d5b5c
5 changed files with 28 additions and 10 deletions

View File

@ -235,6 +235,12 @@ core.trustctime::
crawlers and some backup systems). crawlers and some backup systems).
See linkgit:git-update-index[1]. True by default. See linkgit:git-update-index[1]. True by default.
core.checkstat::
Determines which stat fields to match between the index
and work tree. The user can set this to 'default' or
'minimal'. Default (or explicitly 'default'), is to check
all fields, including the sub-second part of mtime and ctime.
core.quotepath:: core.quotepath::
The commands that output paths (e.g. 'ls-files', The commands that output paths (e.g. 'ls-files',
'diff'), when not given the `-z` option, will quote 'diff'), when not given the `-z` option, will quote

View File

@ -536,6 +536,7 @@ extern int delete_ref(const char *, const unsigned char *sha1, int delopt);
/* Environment bits from configuration mechanism */ /* Environment bits from configuration mechanism */
extern int trust_executable_bit; extern int trust_executable_bit;
extern int trust_ctime; extern int trust_ctime;
extern int check_stat;
extern int quote_path_fully; extern int quote_path_fully;
extern int has_symlinks; extern int has_symlinks;
extern int minimum_abbrev, default_abbrev; extern int minimum_abbrev, default_abbrev;

View File

@ -566,6 +566,12 @@ static int git_default_core_config(const char *var, const char *value)
trust_ctime = git_config_bool(var, value); trust_ctime = git_config_bool(var, value);
return 0; return 0;
} }
if (!strcmp(var, "core.statinfo")) {
if (!strcasecmp(value, "default"))
check_stat = 1;
else if (!strcasecmp(value, "minimal"))
check_stat = 0;
}
if (!strcmp(var, "core.quotepath")) { if (!strcmp(var, "core.quotepath")) {
quote_path_fully = git_config_bool(var, value); quote_path_fully = git_config_bool(var, value);

View File

@ -13,6 +13,7 @@
int trust_executable_bit = 1; int trust_executable_bit = 1;
int trust_ctime = 1; int trust_ctime = 1;
int check_stat = 1;
int has_symlinks = 1; int has_symlinks = 1;
int minimum_abbrev = 4, default_abbrev = 7; int minimum_abbrev = 4, default_abbrev = 7;
int ignore_case; int ignore_case;

View File

@ -197,21 +197,25 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
} }
if (ce->ce_mtime.sec != (unsigned int)st->st_mtime) if (ce->ce_mtime.sec != (unsigned int)st->st_mtime)
changed |= MTIME_CHANGED; changed |= MTIME_CHANGED;
if (trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime) if (trust_ctime && check_stat &&
ce->ce_ctime.sec != (unsigned int)st->st_ctime)
changed |= CTIME_CHANGED; changed |= CTIME_CHANGED;
#ifdef USE_NSEC #ifdef USE_NSEC
if (ce->ce_mtime.nsec != ST_MTIME_NSEC(*st)) if (check_stat && ce->ce_mtime.nsec != ST_MTIME_NSEC(*st))
changed |= MTIME_CHANGED; changed |= MTIME_CHANGED;
if (trust_ctime && ce->ce_ctime.nsec != ST_CTIME_NSEC(*st)) if (trust_ctime && check_stat &&
ce->ce_ctime.nsec != ST_CTIME_NSEC(*st))
changed |= CTIME_CHANGED; changed |= CTIME_CHANGED;
#endif #endif
if (check_stat) {
if (ce->ce_uid != (unsigned int) st->st_uid || if (ce->ce_uid != (unsigned int) st->st_uid ||
ce->ce_gid != (unsigned int) st->st_gid) ce->ce_gid != (unsigned int) st->st_gid)
changed |= OWNER_CHANGED; changed |= OWNER_CHANGED;
if (ce->ce_ino != (unsigned int) st->st_ino) if (ce->ce_ino != (unsigned int) st->st_ino)
changed |= INODE_CHANGED; changed |= INODE_CHANGED;
}
#ifdef USE_STDEV #ifdef USE_STDEV
/* /*
@ -219,7 +223,7 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
* clients will have different views of what "device" * clients will have different views of what "device"
* the filesystem is on * the filesystem is on
*/ */
if (ce->ce_dev != (unsigned int) st->st_dev) if (check_stat && ce->ce_dev != (unsigned int) st->st_dev)
changed |= INODE_CHANGED; changed |= INODE_CHANGED;
#endif #endif