From: Sergio Durigan Junior <sergiodj@sergiodj.net> To: git@vger.kernel.org Subject: Possible race condition with git-rebase + .git/index.lock Date: Mon, 11 Mar 2019 17:38:51 -0400 Message-ID: <87k1h55bx0.fsf@sergiodj.net> (raw) [-- Attachment #1: Type: text/plain, Size: 1623 bytes --] Hi there, I've been bit by this bug many times, and always forget to report it here, but this time I finally remembered. The scenario is this: - I have a local repository which tracks the upstream of the project. - I have 120+ local commits. - Every week or so, I have to rebase my local commits on top of upstream's origin/master. The workflow is simple: # git fetch origin && git rebase origin/master 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. I also I thought it might have something to do with "commitZ", but after I ran "git rebase --abort" and tried rebasing again, I noticed that it would stop at another commit. This seems like a race condition, but after inspecting builtin/rebase.c it doesn't seem like the "git am" commands are run in parallel (and it wouldn't make sense if they did, anyway). I tried using GIT_TRACE, but haven't seen any useful information in the logs. I tried using the "next" branch, and found that the problem exists there as well. I wonder if anyone else has seen this problem. Thanks, -- Sergio GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36 Please send encrypted e-mail if possible http://sergiodj.net/ [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --]
next reply other threads:[~2019-03-11 22:17 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-11 21:38 Sergio Durigan Junior [this message] 2019-03-11 22:50 ` Eric Sunshine 2019-03-11 22:53 ` Sergio Durigan Junior 2019-03-12 10:28 ` Duy Nguyen 2019-03-12 16:45 ` Sergio Durigan Junior 2019-03-12 19:23 ` Elijah Newren 2019-03-12 19:32 ` Sergio Durigan Junior 2019-03-12 19:39 ` Elijah Newren 2019-03-12 19:58 ` Sergio Durigan Junior 2019-03-13 20:40 ` Phillip Wood 2019-03-13 20:48 ` Sergio Durigan Junior 2019-03-13 20:59 ` Jeff King 2019-03-13 21:07 ` Sergio Durigan Junior
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=87k1h55bx0.fsf@sergiodj.net \ --to=sergiodj@sergiodj.net \ --cc=git@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git