I'll merge both Junio's and Jeff's emails into one... My answers bellow.
On Wed, Feb 11, 2009 at 9:40 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> "Ciprian Dorin, Craciun" <ciprian.craciun@xxxxxxxxx> writes:
>
>> On Wed, Feb 11, 2009 at 9:27 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>>
>>> And why isn't it in $HOME/bin/?
>>
>> No, it is inside .git/bin folder.
>
> You are not answering my question.
>
> I questioned the sanity of putting the scripts in .git/bin/ per
> repository. Why shouldn't a useful script like your "branch-import"
> available to _all_ your repositories, possibly taking customization per
> repository from repository's .git/config file, so that it does what is
> appropriate in each repository?
Indeed my problem could be solved by either of the solutions
proposed (I'll summarize them for the sake of completeness):
* using git alias to put simple inline scripts (without need of a
new file), or to put the path to the real script;
* putting the new command into a directory that is referenced from PATH;
Both these solutions work fine, except one concern: when moving
the repository I would also want to move my scripts, and so I'm
remaining with only one candidate: git aliases... (For example I could
move the repository to another machine that I haven't setup with my
own scripts... Of course neither my solution would work, because I
would need a patched Git, but this could be changed if Git would have
this feature built-in :) )
But, there is a disadvantage with git aliases, meaning if I want a
bigger script then I must keep in sync both config file and script
names... Moreover, if I use git from another folder than the work-tree
would the alias still work if I used relative paths? (I don't know but
someone could clear this up as there is no mention about it in the
documentation...)
So my proposal is very simple: make git look inside the GIT_DIR
and see if there is a bin folder; if so add it in the front of path
(thus overriding built-in commands??).
The advantage is that is much simpler to setup commands by just
dropping git-something files inside .git/bin... No config editing, no
relative path problems...
As a conclusion, I've patched Git myself to support such a
feature... (See patch bellow...)
So? Having explained in detail the problem and solutions what is
(are) yours (or others) opinions?
On Wed, Feb 11, 2009 at 9:42 PM, Jeff King <peff@xxxxxxxx> wrote:
> On Wed, Feb 11, 2009 at 09:32:29PM +0200, Ciprian Dorin, Craciun wrote:
>
>> Anyway, I don't see why it's wrong to have such a bin folder per
>> repository... Let's for a moment assume that there is a use case for
>> such a thing, I'm wondering what is wrong with this solution from a
>> Git perspective???
>
> It's not _wrong_, we're just suggesting ways that the same thing might
> be accomplished more easily.
>
>> P.S.: It seems that indeed setup_git_directory_gently (or
>> something in the setup system) is kind of broken if I call it twice...
>
> Yes, I think your patch is running into a long-standing problem in the
> git initialization code. There are problems if you need to look into the
> repo dir to find out which command to execute, because finding the repo
> dir changes the environment. There is a similar problem with aliases.
>
> So I think getting your patch to run correctly may be hard. But I admit
> I didn't look at it that closely.
>
> -Peff
:) I've skipped around the problem (in a non-engineering way) by
adding a variable which enables or disables my feature... And I only
enable it for git.c... :)
Thanks both Junio, Jeff and Shawn for your answers!
Ciprian Craciun.
P.S.: My final (working (hopefully, although tested)) patch bellow.
--------
diff --git a/exec_cmd.c b/exec_cmd.c
index cdd35f9..8d707e1 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -44,6 +44,45 @@ const char *git_exec_path(void)
return system_path(GIT_EXEC_PATH);
}
+/* Returns the path of the bin folder inside the .git folder. */
+/* (This could be used to store repository specific git programs.) */
+
+int enable_git_repo_exec_path = 0;
+
+const char *git_repo_exec_path(void)
+{
+ static char path_buffer[PATH_MAX + 1];
+ static char *path = NULL;
+
+ int non_git;
+ const char *git_dir;
+
+ if (!path && enable_git_repo_exec_path) {
+
+ path = path_buffer;
+ path[0] = '\0';
+
+ setup_git_directory_gently(&non_git);
+
+ if (!non_git) {
+
+ git_dir = get_git_dir();
+
+ strncat(path, git_dir, PATH_MAX);
+ strncat(path, "/", PATH_MAX);
+ strncat(path, "bin", PATH_MAX);
+ strncpy(path, make_absolute_path(path), PATH_MAX);
+ if (access(path, F_OK) != 0)
+ path[0] = '\0';
+ }
+ }
+
+ if (!path || (path[0] == '\0'))
+ return NULL;
+
+ return path;
+}
+
static void add_path(struct strbuf *out, const char *path)
{
if (path && *path) {
@@ -61,6 +100,8 @@ void setup_path(void)
const char *old_path = getenv("PATH");
struct strbuf new_path = STRBUF_INIT;
+ if (git_repo_exec_path() != NULL)
+ add_path(&new_path, git_repo_exec_path());
add_path(&new_path, argv_exec_path);
add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT));
add_path(&new_path, system_path(GIT_EXEC_PATH));
diff --git a/exec_cmd.h b/exec_cmd.h
index 594f961..a02256b 100644
--- a/exec_cmd.h
+++ b/exec_cmd.h
@@ -10,4 +10,6 @@ extern int execv_git_cmd(const char **argv); /* NULL
terminated */
extern int execl_git_cmd(const char *cmd, ...);
extern const char *system_path(const char *path);
+extern int enable_git_repo_exec_path;
+
#endif /* GIT_EXEC_CMD_H */
diff --git a/git.c b/git.c
index 940a498..d312ab9 100644
--- a/git.c
+++ b/git.c
@@ -477,6 +477,7 @@ int main(int argc, const char **argv)
* environment, and the $(gitexecdir) from the Makefile at build
* time.
*/
+ enable_git_repo_exec_path = 1;
setup_path();
while (1) {
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
