mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'jc/index-update-if-able'
* jc/index-update-if-able: update $GIT_INDEX_FILE when there are racily clean entries diff/status: refactor opportunistic index update
This commit is contained in:
commit
149971badc
|
@ -1203,13 +1203,8 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
||||||
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
|
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
|
||||||
|
|
||||||
fd = hold_locked_index(&index_lock, 0);
|
fd = hold_locked_index(&index_lock, 0);
|
||||||
if (0 <= fd) {
|
if (0 <= fd)
|
||||||
if (active_cache_changed &&
|
update_index_if_able(&the_index, &index_lock);
|
||||||
!write_cache(fd, active_cache, active_nr))
|
|
||||||
commit_locked_index(&index_lock);
|
|
||||||
else
|
|
||||||
rollback_lock_file(&index_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
|
s.is_initial = get_sha1(s.reference, sha1) ? 1 : 0;
|
||||||
s.ignore_submodule_arg = ignore_submodule_arg;
|
s.ignore_submodule_arg = ignore_submodule_arg;
|
||||||
|
|
|
@ -197,12 +197,7 @@ static void refresh_index_quietly(void)
|
||||||
discard_cache();
|
discard_cache();
|
||||||
read_cache();
|
read_cache();
|
||||||
refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
|
refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
|
||||||
|
update_index_if_able(&the_index, lock_file);
|
||||||
if (active_cache_changed &&
|
|
||||||
!write_cache(fd, active_cache, active_nr))
|
|
||||||
commit_locked_index(lock_file);
|
|
||||||
|
|
||||||
rollback_lock_file(lock_file);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
|
static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
|
||||||
|
|
1
cache.h
1
cache.h
|
@ -543,6 +543,7 @@ extern NORETURN void unable_to_lock_index_die(const char *path, int err);
|
||||||
extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
|
extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
|
||||||
extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
|
extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
|
||||||
extern int commit_lock_file(struct lock_file *);
|
extern int commit_lock_file(struct lock_file *);
|
||||||
|
extern void update_index_if_able(struct index_state *, struct lock_file *);
|
||||||
|
|
||||||
extern int hold_locked_index(struct lock_file *, int);
|
extern int hold_locked_index(struct lock_file *, int);
|
||||||
extern int commit_locked_index(struct lock_file *);
|
extern int commit_locked_index(struct lock_file *);
|
||||||
|
|
25
read-cache.c
25
read-cache.c
|
@ -1547,6 +1547,31 @@ static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int has_racy_timestamp(struct index_state *istate)
|
||||||
|
{
|
||||||
|
int entries = istate->cache_nr;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < entries; i++) {
|
||||||
|
struct cache_entry *ce = istate->cache[i];
|
||||||
|
if (is_racy_timestamp(istate, ce))
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Opportunisticly update the index but do not complain if we can't
|
||||||
|
*/
|
||||||
|
void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
|
||||||
|
{
|
||||||
|
if ((istate->cache_changed || has_racy_timestamp(istate)) &&
|
||||||
|
!write_index(istate, lockfile->fd))
|
||||||
|
commit_locked_index(lockfile);
|
||||||
|
else
|
||||||
|
rollback_lock_file(lockfile);
|
||||||
|
}
|
||||||
|
|
||||||
int write_index(struct index_state *istate, int newfd)
|
int write_index(struct index_state *istate, int newfd)
|
||||||
{
|
{
|
||||||
git_SHA_CTX c;
|
git_SHA_CTX c;
|
||||||
|
|
Loading…
Reference in a new issue