[PATCH v2] builtin-commit: Refresh cache after adding files.
- From
Kristian Høgsberg <krh@redhat.com>
- Date
- Nov 9, 2007, 18:50 UTC
- Message-ID
- <1194634238-3308-1-git-send-email-krh@redhat.com>
This fixes the race in the last test in t3700-add.sh. add_files_to_cache() should leave the new index stat-clean, but some times it doesn't. Calling refresh_cache() in a few places works around this for now.
Signed-off-by: Kristian Høgsberg <krh@redhat.com> ---
Should we add the refresh_cache() call in add_files_to_cache() instead?
builtin-commit.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c index 7dc8977..81539c8 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -81,6 +81,7 @@ static char *prepare_index(const char **files, const char *prefix) if (all || also) { add_files_to_cache(verbose, also ? prefix : NULL, files); + refresh_cache(REFRESH_QUIET); if (write_cache(fd, active_cache, active_nr) || close(fd)) die("unable to write new_index file"); return lock_file.filename; @@ -94,6 +95,7 @@ static char *prepare_index(const char **files, const char *prefix) /* update the user index file */ add_files_to_cache(verbose, prefix, files); + refresh_cache(REFRESH_QUIET); if (write_cache(fd, active_cache, active_nr) || close(fd)) die("unable to write new_index file"); @@ -110,6 +112,7 @@ static char *prepare_index(const char **files, const char *prefix) fd = hold_lock_file_for_update(next_index_lock, git_path("next-index-%d", getpid()), 1); add_files_to_cache(verbose, prefix, files); + refresh_cache(REFRESH_QUIET); if (write_cache(fd, active_cache, active_nr) || close(fd)) die("unable to write new_index file");
-- 1.5.3.4.206.g58ba4