summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorKyle J. McKay <mackyle@gmail.com>2013-12-31 12:07:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-03 00:15:29 (GMT)
commited7eda8b38ec6230abf79986668ccb6e2e2c7494 (patch)
tree40b51a66cdd8af56c5a1c106f30e7cfd2d3d6099 /builtin/gc.c
parentd2446dfd7f3b3f8948142cfb07a0270e2497d93f (diff)
downloadgit-ed7eda8b38ec6230abf79986668ccb6e2e2c7494.zip
git-ed7eda8b38ec6230abf79986668ccb6e2e2c7494.tar.gz
git-ed7eda8b38ec6230abf79986668ccb6e2e2c7494.tar.bz2
gc: notice gc processes run by other users
Since 64a99eb4 git gc refuses to run without the --force option if another gc process on the same repository is already running. However, if the repository is shared and user A runs git gc on the repository and while that gc is still running user B runs git gc on the same repository the gc process run by user A will not be noticed and the gc run by user B will go ahead and run. The problem is that the kill(pid, 0) test fails with an EPERM error since user B is not allowed to signal processes owned by user A (unless user B is root). Update the test to recognize an EPERM error as meaning the process exists and another gc should not be run (unless --force is given). Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/gc.c')
-rw-r--r--builtin/gc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index c14190f..25f2237 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -222,7 +222,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
time(NULL) - st.st_mtime <= 12 * 3600 &&
fscanf(fp, "%"PRIuMAX" %127c", &pid, locking_host) == 2 &&
/* be gentle to concurrent "gc" on remote hosts */
- (strcmp(locking_host, my_host) || !kill(pid, 0));
+ (strcmp(locking_host, my_host) || !kill(pid, 0) || errno == EPERM);
if (fp != NULL)
fclose(fp);
if (should_exit) {