On 27.07.21 00:05, Junio C Hamano wrote:
"Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx>
writes:
From: Johannes Schindelin <johannes.schindelin@xxxxxx>
It is not immediately clear what `expand_user_path()` means, so let's
rename it to `interpolate_path()`. This also opens the path for
interpolating more than just a home directory.
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
...
diff --git a/cache.h b/cache.h
index ba04ff8bd36..87e4cbe9c5f 100644
--- a/cache.h
+++ b/cache.h
@@ -1246,7 +1246,7 @@ typedef int create_file_fn(const char *path, void *cb);
int raceproof_create_file(const char *path, create_file_fn fn, void *cb);
int mkdir_in_gitdir(const char *path);
-char *expand_user_path(const char *path, int real_home);
+char *interpolate_path(const char *path, int real_home);
This of course breaks any topic in flight that adds more places to
use expand_user_path().
I think Fabian's "ssh signing" is not as ready as this topic, and it
can afford to wait by rebasing on top of this topic. By the time
"ssh signing" gets into testable shape (right now, it does not pass
tests when merged to 'seen'), hopefully the "expand install-prefix"
topic may already be in 'next' if not in 'master'.
I think the test problem is not due to my patch.
Like Ævar wrote it's "hn/reftable probably interacting with my
ab/refs-files-cleanup" [1]
The failed tests i can see in [2] are either t0031-reftable.sh or a
compile failure referencing reftable as well.
If i merge the ssh code into the current seen branch everything works
fine for me. Let me know if you have any other results / CI runs that
might help.
[1] https://lore.kernel.org/git/87a6mevkrx.fsf@xxxxxxxxxxxxxxxxxxx/
[2] https://github.com/git/git/actions/runs/1053603028
In the meantime, I am adding this band-aid at the tip of this topic
to help these two topics play together better.
Thanks.
diff --git a/cache.h b/cache.h
index 87e4cbe9c5..679a27e17c 100644
--- a/cache.h
+++ b/cache.h
@@ -1247,6 +1247,8 @@ int raceproof_create_file(const char *path, create_file_fn fn, void *cb);
int mkdir_in_gitdir(const char *path);
char *interpolate_path(const char *path, int real_home);
+/* NEEDSWORK: remove this synonym once in-flight topics have migrated */
+#define expand_user_path interpolate_path
const char *enter_repo(const char *path, int strict);
static inline int is_absolute_path(const char *path)
{
