From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 8C98120248 for ; Wed, 13 Mar 2019 20:48:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727116AbfCMUsm (ORCPT ); Wed, 13 Mar 2019 16:48:42 -0400 Received: from kwanyin.sergiodj.net ([158.69.185.54]:43654 "EHLO kwanyin.sergiodj.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726530AbfCMUsm (ORCPT ); Wed, 13 Mar 2019 16:48:42 -0400 From: Sergio Durigan Junior To: Phillip Wood Cc: Elijah Newren , phillip.wood@dunelm.org.uk, Duy Nguyen , Git Mailing List Subject: Re: Possible race condition with git-rebase + .git/index.lock References: <87k1h55bx0.fsf@sergiodj.net> <877ed459eh.fsf@sergiodj.net> <8736nr6g94.fsf@sergiodj.net> X-URL: http://blog.sergiodj.net Date: Wed, 13 Mar 2019 16:48:36 -0400 In-Reply-To: (Phillip Wood's message of "Wed, 13 Mar 2019 20:40:32 +0000") Message-ID: <87pnqu4i1n.fsf@sergiodj.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wednesday, March 13 2019, Phillip Wood wrote: > Hi Sergio > > On 12/03/2019 19:32, Sergio Durigan Junior wrote: >> On Tuesday, March 12 2019, Elijah Newren wrote: >> >>> On Tue, Mar 12, 2019 at 9:48 AM Sergio Durigan Junior >>> wrote: >>>> On Tuesday, March 12 2019, Duy Nguyen wrote: >>>> >>>>> On Tue, Mar 12, 2019 at 5:18 AM Sergio Durigan Junior >>>>> wrote: >>>>>> This works without problems most of the time (well, usually there are >>>>>> conflicts and all, but that's a burden I have to carry). However, >>>>>> sometimes I notice that git fails with: >>>>>> >>>>>> # git rebase origin/master >>>>>> ... >>>>>> Applying: commitX >>>>>> Applying: commitY >>>>>> Applying: commitZ >>>>>> fatal: Unable to create '/home/xyz/dir1/dir2/.git/index.lock': File exists. >>>>>> >>>>>> The first thing I did was to check whether the index.lock file existed, >>>>>> but it doesn't. >>>>> >>>>> Is the output this clean? What I'm looking for is signs of automatic >>>>> garbage collection kicking in the middle of the rebase. Something like >>>>> "Auto packing the repository blah blah for optimum performance". >>>> >>>> Yeah, this is the exact output. I also thought about "git gc", but I >>>> don't see any output related to it. Is it possible that it's being >>>> executed in the background and not printing anything? >>> >>> Any chance you have a cronjob or other task execution mechanism that >>> is running git commands in various directories (even simple commands >>> like 'git status' since it's not read-only contrary to what some >>> expect, or 'git fetch' which might trigger a background gc)? >> >> Nope, nothing like this. AFAIK, nothing is touching that repository at >> the same time that I am. Besides, even if I wait some minutes before >> trying again, the bug manifests again. >> > > Do you have any of the files in the repository open in an editor or > ide while you are rebasing? I have seen this message when rebasing and > one of the files is open in emacs which runs git status when it sees a > file has changed which locks the index while the rebase is running. Hey Phillip, Huh, I do have some of the files opened in Emacs! They're in background, but indeed, now that you mentioned I remember that Emacs keeps track of changes and invokes "git status" sometimes. Next time I see the bug, I'll try closing the files and see if it happens again. Thanks for the insight! -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible http://sergiodj.net/