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

Re: [PATCH v2 2/2] Make locked paths absolute when current directory is changed

From
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date
Jul 21, 2014, 13:27 UTC
Message-ID
<53CD1529.9080102@ramsay1.demon.co.uk>
In-Reply-To
<1405858399-23082-2-git-send-email-pclouds@gmail.com>
On 20/07/14 13:13, Nguyễn Thái Ngọc Duy wrote:
Show 21 quoted lines
> Locked paths are saved in a linked list so that if something wrong
> happens, *.lock are removed. This works fine if we keep cwd the same,
> which is true 99% of time except:
> 
>  - update-index and read-tree hold the lock on $GIT_DIR/index really
>    early, then later on may call setup_work_tree() to move cwd.
> 
>  - Suppose a lock is being held (e.g. by "git add") then somewhere
>    down the line, somebody calls real_path (e.g. "link_alt_odb_entry"),
>    which temporarily moves cwd away and back.
> 
> During that time when cwd is moved (either permanently or temporarily)
> and we decide to die(), attempts to remove relative *.lock will fail,
> and the next operation will complain that some files are still locked.
> 
> Avoid this case by turning relative paths to absolute when chdir() is
> called (or soon to be called, in setup_git_directory_gently case).
> 
> Reported-by: Yue Lin Ho <yuelinho777@gmail.com>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
[snip]
Show 20 quoted lines
> diff --git a/lockfile.c b/lockfile.c
> index 968b28f..cf1e795 100644
> --- a/lockfile.c
> +++ b/lockfile.c
> @@ -288,3 +288,15 @@ void rollback_lock_file(struct lock_file *lk)
>  	}
>  	clear_filename(lk);
>  }
> +
> +void make_locked_paths_absolute(void)
> +{
> +	struct lock_file *lk;
> +	for (lk = lock_file_list; lk != NULL; lk = lk->next) {
> +		if (lk->filename && !is_absolute_path(lk->filename)) {
> +			char *to_free = lk->filename;
> +			lk->filename = xstrdup(absolute_path(lk->filename));
> +			free(to_free);
> +		}
> +	}
> +}

I just have to ask, why are we putting relative pathnames in this list to begin with? Why not use an absolute path when taking the lock in all cases? (calling absolute_path() and using the result to take the lock, storing it in the lock_file list, should not be in the critical path, right? Not that I have measured it, of course! :)

ATB, Ramsay Jones

Previous: Nguyễn Thái Ngọc DuyNext: Duy Nguyen
Message 7 of 27 in “Make locked paths absolute when current directory is changed”
  1. Make locked paths absolute when current directory is changedNguyễn Thái Ngọc Duy, Jul 18, 2014
  2. Junio C HamanoJul 18, 2014
  3. Duy NguyenJul 19, 2014
  4. Johannes SixtJul 18, 2014
  5. 1/2 lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)Nguyễn Thái Ngọc Duy, Jul 20, 2014
  6. 2/2 Make locked paths absolute when current directory is changedNguyễn Thái Ngọc Duy, Jul 20, 2014
  7. Ramsay JonesJul 21, 2014
  8. Duy NguyenJul 21, 2014
  9. Ramsay JonesJul 21, 2014
  10. Junio C HamanoJul 21, 2014
  11. Duy NguyenJul 23, 2014
  12. Yue Lin HoJul 31, 2014
  13. Duy NguyenJul 31, 2014
  14. Philip OakleyJul 20, 2014
  15. Duy NguyenJul 20, 2014
  16. 0/3 Keep .lock file paths absoluteNguyễn Thái Ngọc Duy, Jul 31, 2014
  17. 1/3 lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)Nguyễn Thái Ngọc Duy, Jul 31, 2014
  18. Junio C HamanoAug 1, 2014
  19. Junio C HamanoAug 1, 2014
  20. Torsten BögershausenAug 2, 2014
  21. Duy NguyenAug 4, 2014
  22. Junio C HamanoAug 4, 2014
  23. Michael HaggertyAug 5, 2014
  24. Yue Lin HoSep 3, 2014
  25. Junio C HamanoAug 1, 2014
  26. 2/3 lockfile.c: remove PATH_MAX limit in resolve_symlink()Nguyễn Thái Ngọc Duy, Jul 31, 2014
  27. 3/3 lockfile.c: store absolute pathNguyễn Thái Ngọc Duy, Jul 31, 2014

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.