Handle `git_path()` with lock files correctly in worktrees #401

dscho · 2019-10-15T18:46:26Z

I stumbled over this during my recent work in Git GUI that was originally really only intended to use the correct hooks directory.

It turns out that my fears that index.lock was mishandled were unfounded, hence this patch series has a lot lower priority for me than "OMG we must push this into v2.24.0!".

Technically, the first patch is not needed (because I decided against adding a test to t1400 in the end, in favor of t1500), but it shouldn't hurt, either.

I verified locally that this patch pair does not conflict with sg/dir-trie-fixes.

Changes since v3:

Instead of duplicating the path when it has a .lock suffix, we now use strbuf manipulation to strip the suffix temporarily.
The test case in t1500 was scrapped in favor of a much simpler pair of test cases in t0060.

Changes since v2:

Adjusted the commit message to really not talk about index.lock.
Instead of modifying the code inside trie_find() to special-case .lock, I now copy the string without the suffix .lock (if any) before handing it off to trie_find().

Changes since v1:

Clarified the commit message to state that index.lock is fine, it is logs/HEAD.lock that isn't.

Without this, you cannot use `--run=<...>` to skip that part, and a run with `--run=0` (which is a common way to determine the test case number corresponding to a given test case title). Signed-off-by: Johannes Schindelin <[email protected]>

dscho · 2019-10-16T07:06:29Z

/submit

gitgitgadget · 2019-10-16T07:07:32Z

Submitted as [email protected]

path.c

dscho · 2019-10-17T22:07:06Z

/submit

gitgitgadget · 2019-10-17T22:08:13Z

Submitted as [email protected]

path.c

gitgitgadget · 2019-10-18T02:33:42Z

This branch is now known as js/git-path-head-dot-lock-fix.

gitgitgadget · 2019-10-18T02:33:43Z

This patch series was integrated into pu via git@5c3ead4.

gitgitgadget · 2019-10-18T11:48:58Z

This patch series was integrated into pu via git@48502d2.

gitgitgadget · 2019-10-21T08:44:12Z

This patch series was integrated into pu via git@e9e2058.

dscho · 2019-10-21T21:53:49Z

/submit

gitgitgadget · 2019-10-21T21:55:19Z

Submitted as [email protected]

gitgitgadget · 2019-10-22T11:35:15Z

This patch series was integrated into pu via git@38fe1fc.

path.c

Ever since worktrees were introduced, the `git_path()` function _really_ needed to be called e.g. to get at the path to `logs/HEAD` (`HEAD` is specific to the worktree, and therefore so is its reflog). However, the wrong path is returned for `logs/HEAD.lock`. This does not matter as long as the Git executable is doing the asking, as the path for that `logs/HEAD.lock` file is constructed from `git_path("logs/HEAD")` by appending the `.lock` suffix. However, Git GUI just learned to use `--git-path` instead of appending relative paths to what `git rev-parse --git-dir` returns (and as a consequence not only using the correct hooks directory, but also using the correct paths in worktrees other than the main one). While it does not seem as if Git GUI in particular is asking for `logs/HEAD.lock`, let's be safe rather than sorry. Side note: Git GUI _does_ ask for `index.lock`, but that is already resolved correctly, due to `update_common_dir()` preferring to leave unknown paths in the (worktree-specific) git directory. Signed-off-by: Johannes Schindelin <[email protected]>

dscho · 2019-10-28T12:56:21Z

/submit

gitgitgadget · 2019-10-28T12:57:34Z

Submitted as [email protected]

gitgitgadget · 2019-10-29T04:34:08Z

This patch series was integrated into pu via git@af2a863.

gitgitgadget · 2019-10-30T07:47:41Z

This patch series was integrated into pu via git@6fe6fec.

gitgitgadget · 2019-11-02T10:37:43Z

This patch series was integrated into pu via git@7c3951c.

gitgitgadget · 2019-11-04T05:34:02Z

This patch series was integrated into pu via git@74393e7.

gitgitgadget · 2019-11-06T13:38:04Z

This patch series was integrated into pu via git@0fd1045.

gitgitgadget · 2019-11-07T11:15:02Z

This patch series was integrated into pu via git@6e6457e.

gitgitgadget · 2019-11-08T08:48:23Z

This patch series was integrated into pu via git@29765d6.

gitgitgadget · 2019-11-10T08:59:09Z

This patch series was integrated into pu via git@dcbbf86.

gitgitgadget · 2019-11-11T04:51:05Z

This patch series was integrated into pu via git@2b65dbb.

gitgitgadget · 2019-11-12T08:44:47Z

This patch series was integrated into pu via git@befc330.

gitgitgadget · 2019-11-19T07:12:15Z

This patch series was integrated into pu via git@29cd43a.

gitgitgadget · 2019-11-19T07:12:17Z

This patch series was integrated into next via git@b406944.

gitgitgadget · 2019-11-20T05:50:52Z

This patch series was integrated into pu via git@48f9bda.

gitgitgadget · 2019-11-21T07:41:35Z

This patch series was integrated into pu via git@1f121e3.

gitgitgadget · 2019-11-22T08:36:01Z

This patch series was integrated into pu via git@80883c4.

gitgitgadget · 2019-11-25T08:55:02Z

This patch series was integrated into pu via git@07e86b8.

gitgitgadget · 2019-11-27T10:12:35Z

This patch series was integrated into pu via git@a126152.

gitgitgadget · 2019-12-02T16:15:49Z

This patch series was integrated into pu via git@a2b0451.

gitgitgadget · 2019-12-02T16:15:51Z

This patch series was integrated into next via git@a2b0451.

gitgitgadget · 2019-12-02T16:15:52Z

This patch series was integrated into master via git@a2b0451.

gitgitgadget · 2019-12-02T16:15:56Z

Closed via a2b0451.

t1400: wrap setup code in test case

cf97c51

Without this, you cannot use `--run=<...>` to skip that part, and a run with `--run=0` (which is a common way to determine the test case number corresponding to a given test case title). Signed-off-by: Johannes Schindelin <[email protected]>

dscho force-pushed the lock-files-in-worktrees branch from 0bde197 to f08c90e Compare October 15, 2019 19:20

gitgitgadget bot reviewed Oct 16, 2019

View reviewed changes

path.c Outdated Show resolved Hide resolved

dscho force-pushed the lock-files-in-worktrees branch from f08c90e to 93dba5a Compare October 17, 2019 22:01

gitgitgadget bot reviewed Oct 18, 2019

View reviewed changes

path.c Outdated Show resolved Hide resolved

gitgitgadget bot added the pu label Oct 18, 2019

weekly-digest bot mentioned this pull request Oct 20, 2019

Weekly Digest (13 October, 2019 - 20 October, 2019) #409

Closed

dscho force-pushed the lock-files-in-worktrees branch from 93dba5a to 8b1f4f0 Compare October 21, 2019 21:15

gitgitgadget bot reviewed Oct 22, 2019

View reviewed changes

path.c Outdated Show resolved Hide resolved

dscho force-pushed the lock-files-in-worktrees branch from 8b1f4f0 to d988108 Compare October 28, 2019 11:59

This comment has been minimized.

Sign in to view

gitgitgadget bot added the next label Nov 19, 2019

gitgitgadget bot added the master label Dec 2, 2019

gitgitgadget bot closed this Dec 2, 2019

dscho deleted the lock-files-in-worktrees branch December 2, 2019 22:56

Handle git_path() with lock files correctly in worktrees #401

Handle git_path() with lock files correctly in worktrees #401

Uh oh!

Conversation

dscho commented Oct 15, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dscho commented Oct 16, 2019

Uh oh!

gitgitgadget bot commented Oct 16, 2019

Uh oh!

Uh oh!

dscho commented Oct 17, 2019

Uh oh!

gitgitgadget bot commented Oct 17, 2019

Uh oh!

Uh oh!

gitgitgadget bot commented Oct 18, 2019

Uh oh!

gitgitgadget bot commented Oct 18, 2019

Uh oh!

gitgitgadget bot commented Oct 18, 2019

Uh oh!

gitgitgadget bot commented Oct 21, 2019

Uh oh!

dscho commented Oct 21, 2019

Uh oh!

gitgitgadget bot commented Oct 21, 2019

Uh oh!

gitgitgadget bot commented Oct 22, 2019

Uh oh!

Uh oh!

dscho commented Oct 28, 2019

Uh oh!

gitgitgadget bot commented Oct 28, 2019

Uh oh!

This comment has been minimized.

gitgitgadget bot commented Oct 29, 2019

Uh oh!

gitgitgadget bot commented Oct 30, 2019

Uh oh!

gitgitgadget bot commented Nov 2, 2019

Uh oh!

gitgitgadget bot commented Nov 4, 2019

Uh oh!

gitgitgadget bot commented Nov 6, 2019

Uh oh!

gitgitgadget bot commented Nov 7, 2019

Uh oh!

gitgitgadget bot commented Nov 8, 2019

Uh oh!

gitgitgadget bot commented Nov 10, 2019

Uh oh!

gitgitgadget bot commented Nov 11, 2019

Uh oh!

gitgitgadget bot commented Nov 12, 2019

Uh oh!

gitgitgadget bot commented Nov 19, 2019

Uh oh!

gitgitgadget bot commented Nov 19, 2019

Uh oh!

gitgitgadget bot commented Nov 20, 2019

Uh oh!

gitgitgadget bot commented Nov 21, 2019

Uh oh!

gitgitgadget bot commented Nov 22, 2019

Uh oh!

gitgitgadget bot commented Nov 25, 2019

Uh oh!

gitgitgadget bot commented Nov 27, 2019

Uh oh!

gitgitgadget bot commented Dec 2, 2019

Uh oh!

gitgitgadget bot commented Dec 2, 2019

Uh oh!

gitgitgadget bot commented Dec 2, 2019

Uh oh!

gitgitgadget bot commented Dec 2, 2019

Uh oh!

Uh oh!

Handle `git_path()` with lock files correctly in worktrees #401

Handle `git_path()` with lock files correctly in worktrees #401

dscho commented Oct 15, 2019 •

edited

Loading