diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-02-12 14:47:47 (GMT) |
---|---|---|
committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-02-12 14:47:47 (GMT) |
commit | fb049fd85b298d386dca2e0bcf74a1f52a7b2038 (patch) | |
tree | 48d5164a342eb50fe9bacbdd3be510a786135062 /run-command.c | |
parent | 76b54ee9b9944ee70422ac24884f78769cf264f1 (diff) | |
parent | 6eed462c8f973719799691c4f51b97f7970f2ac4 (diff) | |
download | git-fb049fd85b298d386dca2e0bcf74a1f52a7b2038.zip git-fb049fd85b298d386dca2e0bcf74a1f52a7b2038.tar.gz git-fb049fd85b298d386dca2e0bcf74a1f52a7b2038.tar.bz2 |
Sync with 2.18.5
* maint-2.18:
Git 2.18.5
Git 2.17.6
unpack_trees(): start with a fresh lstat cache
run-command: invalidate lstat cache after a command finished
checkout: fix bug that makes checkout follow symlinks in leading path
Diffstat (limited to 'run-command.c')
-rw-r--r-- | run-command.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/run-command.c b/run-command.c index d679cc2..33fedcd 100644 --- a/run-command.c +++ b/run-command.c @@ -963,6 +963,7 @@ int finish_command(struct child_process *cmd) { int ret = wait_or_whine(cmd->pid, cmd->argv[0], 0); child_process_clear(cmd); + invalidate_lstat_cache(); return ret; } @@ -1249,13 +1250,19 @@ error: int finish_async(struct async *async) { #ifdef NO_PTHREADS - return wait_or_whine(async->pid, "child process", 0); + int ret = wait_or_whine(async->pid, "child process", 0); + + invalidate_lstat_cache(); + + return ret; #else void *ret = (void *)(intptr_t)(-1); if (pthread_join(async->tid, &ret)) error("pthread_join failed"); + invalidate_lstat_cache(); return (int)(intptr_t)ret; + #endif } |