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

[PATCH 8/8] refs: adjust main repo paths when $CWD moves

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
Mar 28, 2018, 17:55 UTC
Message-ID
<20180328175537.17450-9-pclouds@gmail.com>
In-Reply-To
<20180328175537.17450-1-pclouds@gmail.com>
From: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 refs.c                | 10 ++++++++++
 refs/files-backend.c  | 15 +++++++++++++++
 refs/packed-backend.c | 12 ++++++++++++
 refs/refs-internal.h  |  4 ++++
 setup.c               |  1 +
 5 files changed, 42 insertions(+)
diff --git a/refs.c b/refs.c
index 8b7a77fe5e..2457a31d4d 100644
--- a/refs.c
+++ b/refs.c
@@ -1651,12 +1651,22 @@ static struct ref_store *ref_store_init(const char *gitdir,
 	return refs;
 }
 
+static void ref_store_adjust_paths(const char *old_cwd,
+				   const char *new_cwd,
+				   void *cb)
+{
+	struct ref_store *refs = cb;
+
+	refs->be->adjust_paths(refs, old_cwd, new_cwd);
+}
+
 struct ref_store *get_main_ref_store(void)
 {
 	if (main_ref_store)
 		return main_ref_store;
 
 	main_ref_store = ref_store_init(get_git_dir(), REF_STORE_ALL_CAPS);
+	add_cwd_update_callback(ref_store_adjust_paths, main_ref_store);
 	return main_ref_store;
 }
 
diff --git a/refs/files-backend.c b/refs/files-backend.c
index bec8e30e9e..d35a8db844 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3092,6 +3092,20 @@ static int files_reflog_expire(struct ref_store *ref_store,
 	return -1;
 }
 
+static void files_adjust_paths(struct ref_store *ref_store,
+			       const char *old_cwd,
+			       const char *new_cwd)
+{
+	struct files_ref_store *refs =
+		files_downcast(ref_store, REF_STORE_WRITE,
+			       "files_adjust_paths");
+
+	setup_adjust_path("ref store's gitdir",
+			  &refs->gitdir, old_cwd, new_cwd);
+	setup_adjust_path("ref store's commondir",
+			  &refs->gitcommondir, old_cwd, new_cwd);
+}
+
 static int files_init_db(struct ref_store *ref_store, struct strbuf *err)
 {
 	struct files_ref_store *refs =
@@ -3117,6 +3131,7 @@ struct ref_storage_be refs_be_files = {
 	"files",
 	files_ref_store_create,
 	files_init_db,
+	files_adjust_paths,
 	files_transaction_prepare,
 	files_transaction_finish,
 	files_transaction_abort,
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 65288c6472..764d1250a5 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -1047,6 +1047,17 @@ int packed_refs_is_locked(struct ref_store *ref_store)
 	return is_lock_file_locked(&refs->lock);
 }
 
+static void packed_adjust_paths(struct ref_store *ref_store,
+				const char *old_cwd,
+				const char *new_cwd)
+{
+	struct packed_ref_store *refs =
+		packed_downcast(ref_store, REF_STORE_WRITE,
+				"packed_adjust_paths");
+
+	setup_adjust_path("packed-refs", &refs->path, old_cwd, new_cwd);
+}
+
 /*
  * The packed-refs header line that we write out. Perhaps other traits
  * will be added later.
@@ -1632,6 +1643,7 @@ struct ref_storage_be refs_be_packed = {
 	"packed",
 	packed_ref_store_create,
 	packed_init_db,
+	packed_adjust_paths,
 	packed_transaction_prepare,
 	packed_transaction_finish,
 	packed_transaction_abort,
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index dd834314bd..73480543c0 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -505,6 +505,9 @@ struct ref_store;
  */
 typedef struct ref_store *ref_store_init_fn(const char *gitdir,
 					    unsigned int flags);
+typedef void ref_store_adjust_paths_fn(struct ref_store *refs,
+				       const char *old_cwd,
+				       const char *new_cwd);
 
 typedef int ref_init_db_fn(struct ref_store *refs, struct strbuf *err);
 
@@ -625,6 +628,7 @@ struct ref_storage_be {
 	const char *name;
 	ref_store_init_fn *init;
 	ref_init_db_fn *init_db;
+	ref_store_adjust_paths_fn *adjust_paths;
 
 	ref_transaction_prepare_fn *transaction_prepare;
 	ref_transaction_finish_fn *transaction_finish;
diff --git a/setup.c b/setup.c
index e364aea7e5..35e89a03e5 100644
--- a/setup.c
+++ b/setup.c
@@ -3,6 +3,7 @@
 #include "config.h"
 #include "dir.h"
 #include "string-list.h"
+#include "refs.h"
 
 static int inside_git_dir = -1;
 static int inside_work_tree = -1;
-- 
2.17.0.rc1.439.gca064e2955
Previous: Duy NguyenNext: Nguyễn Thái Ngọc Duy
Message 49 of 54 in “git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.”
  1. Rafael AscensaoMar 26, 2018
  2. Ævar Arnfjörð BjarmasonMar 26, 2018
  3. Jeff KingMar 27, 2018
  4. Duy NguyenMar 27, 2018
  5. Jeff KingMar 27, 2018
  6. Duy NguyenMar 27, 2018
  7. Duy NguyenMar 27, 2018
  8. Jeff KingMar 28, 2018
  9. Duy NguyenMar 28, 2018
  10. Jeff KingMar 28, 2018
  11. 1/4 set_git_dir: die when setenv() failsJeff King, Mar 28, 2018
  12. 2/4 add chdir-notify APIJeff King, Mar 28, 2018
  13. Eric SunshineMar 28, 2018
  14. Jeff KingMar 28, 2018
  15. Duy NguyenMar 29, 2018
  16. Jeff KingMar 29, 2018
  17. Duy NguyenMar 29, 2018
  18. 3/4 set_work_tree: use chdir_notifyJeff King, Mar 28, 2018
  19. Duy NguyenMar 29, 2018
  20. Duy NguyenMar 29, 2018
  21. Jeff KingMar 29, 2018
  22. Jeff KingMar 29, 2018
  23. Duy NguyenMar 29, 2018
  24. Jeff KingMar 30, 2018
  25. 4/4 refs: use chdir_notify to update cached relative pathsJeff King, Mar 28, 2018
  26. 0/5 re-parenting relative directories after chdirJeff King, Mar 30, 2018
  27. 1/5 set_git_dir: die when setenv() failsJeff King, Mar 30, 2018
  28. 2/5 trace.c: export trace_setup_keyJeff King, Mar 30, 2018
  29. Junio C HamanoMar 30, 2018
  30. Jeff KingMar 30, 2018
  31. Junio C HamanoMar 30, 2018
  32. Jeff KingMar 30, 2018
  33. 3/5 add chdir-notify APIJeff King, Mar 30, 2018
  34. 4/5 set_work_tree: use chdir_notifyJeff King, Mar 30, 2018
  35. 5/5 refs: use chdir_notify to update cached relative pathsJeff King, Mar 30, 2018
  36. Duy NguyenMar 30, 2018
  37. Jeff KingMar 28, 2018
  38. 0/8 Re: git complains packed-refs is not a directory when used with GIT_DIR and GIT_WORK_TREE envvars.Nguyễn Thái Ngọc Duy, Mar 28, 2018
  39. 1/8 strbuf.c: add strbuf_ensure_trailing_dr_sep()Nguyễn Thái Ngọc Duy, Mar 28, 2018
  40. 2/8 strbuf.c: reintroduce get_pwd_cwd() (with strbuf_ prefix)Nguyễn Thái Ngọc Duy, Mar 28, 2018
  41. Stefan BellerMar 28, 2018
  42. Duy NguyenMar 28, 2018
  43. 3/8 trace.c: export trace_setup_keyNguyễn Thái Ngọc Duy, Mar 28, 2018
  44. 4/8 setup.c: introduce setup_adjust_path()Nguyễn Thái Ngọc Duy, Mar 28, 2018
  45. 5/8 setup.c: allow other code to be notified when $CWD movesNguyễn Thái Ngọc Duy, Mar 28, 2018
  46. 6/8 environment.c: adjust env containing relpath when $CWD is movedNguyễn Thái Ngọc Duy, Mar 28, 2018
  47. Jeff KingMar 28, 2018
  48. Duy NguyenMar 28, 2018
  49. 8/8 refs: adjust main repo paths when $CWD movesNguyễn Thái Ngọc Duy, Mar 28, 2018
  50. 7/8 repository: adjust repo paths when $CWD movesNguyễn Thái Ngọc Duy, Mar 28, 2018
  51. Jeff KingMar 28, 2018
  52. Duy NguyenMar 29, 2018
  53. Jeff KingMar 30, 2018
  54. Junio C HamanoMar 28, 2018

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.