git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[BUG] Index.lock error message regression in git 2.11.0

From
RIRobbie Iannucci <iannucci@google.com>
Date
Dec 3, 2016, 01:44 UTC
Message-ID
<CA+q_oBdHytoeSD-hmLx_N473M8XinjqckvE35Re3eNpQRWYjHQ@mail.gmail.com>
Hello,

I just upgraded to 2.11.0 from 2.10.2, and I noticed that some commands no longer print an error message when the `index.lock` file exists (such as `git merge --ff-only`).

It appears this bug was introduced in 55f5704da69d3e6836620f01bee0093ad5e331e8 (sequencer: lib'ify checkout_fast_forward()). I determined this by running the attached bisect script (on OS X, but I don't think that matters; I've also seen the error message missing on Linux):

$ cd /path/to/git/src $ git bisect start v2.11.0-rc0 v2.10.2 $ git bisect run /path/to/bisect.test.sh

(my original version of the script also includes some other makefile parameters to get a modern version of gettext and openssl too, but they're not relevant to this ML).

I'm not certain that I have enough context to propose a meaningful patch though :/.

Cheers, Robbie

Next: Robbie Iannucci
Message 1 of 19 in “[BUG] Index.lock error message regression in git 2.11.0”
  1. Robbie IannucciDec 3, 2016
  2. Robbie IannucciDec 3, 2016
  3. Junio C HamanoDec 6, 2016
  4. Re* [BUG] Index.lock error message regression in git 2.11.0Junio C Hamano, Dec 6, 2016
  5. Junio C HamanoDec 7, 2016
  6. 0/3 Do not be totally silent upon lock errorJunio C Hamano, Dec 7, 2016
  7. 1/3 wt-status: implement opportunisitc index update correctlyJunio C Hamano, Dec 7, 2016
  8. Stefan BellerDec 7, 2016
  9. Junio C HamanoDec 7, 2016
  10. Stefan BellerDec 7, 2016
  11. Junio C HamanoDec 7, 2016
  12. Stefan BellerDec 7, 2016
  13. Paul TanDec 8, 2016
  14. Junio C HamanoDec 8, 2016
  15. 2/3 hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano, Dec 7, 2016
  16. 3/3 lockfile: LOCK_REPORT_ON_ERRORJunio C Hamano, Dec 7, 2016
  17. Johannes SchindelinDec 8, 2016
  18. Robbie IannucciDec 8, 2016
  19. Junio C HamanoDec 8, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.