setup: Provide GIT_PREFIX to built-ins

GIT_PREFIX was added in 7cf16a14f5c070f7b14cf28023769450133172ae so that
aliases can know the directory from which a !alias was called.

Knowing the prefix relative to the root is helpful in other programs
so export it to built-ins as well.

Helped-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/setup.c b/setup.c
index 03cd84f2fcbf9cdbc25116308a9c2c9407af8e71..63f5368d901564010d0575485cd07e6b90bdf173 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -602,6 +602,11 @@ const char *setup_git_directory_gently(int *nongit_ok)
        const char *prefix;
 
        prefix = setup_git_directory_gently_1(nongit_ok);
        const char *prefix;
 
        prefix = setup_git_directory_gently_1(nongit_ok);

+       if (prefix)
+               setenv("GIT_PREFIX", prefix, 1);
+       else
+               setenv("GIT_PREFIX", "", 1);
+

        if (startup_info) {
                startup_info->have_repository = !nongit_ok || !*nongit_ok;
                startup_info->prefix = prefix;
        if (startup_info) {
                startup_info->have_repository = !nongit_ok || !*nongit_ok;
                startup_info->prefix = prefix;

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index ddc3921ac6a009dfc706cd19ad94f2b29af4b1cc..3c7448026d452a9b7d0de621d251f73d0379fe8f 100755 (executable)
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -139,6 +139,22 @@ test_expect_success 'GIT_PREFIX for !alias' '
        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 

+test_expect_success 'GIT_PREFIX for built-ins' '
+       # Use GIT_EXTERNAL_DIFF to test that the "diff" built-in
+       # receives the GIT_PREFIX variable.
+       printf "dir/" >expect &&
+       printf "#!/bin/sh\n" >diff &&
+       printf "printf \"\$GIT_PREFIX\"" >>diff &&
+       chmod +x diff &&
+       (
+               cd dir &&
+               printf "change" >two &&
+               env GIT_EXTERNAL_DIFF=./diff git diff >../actual
+               git checkout -- two
+       ) &&
+       test_cmp expect actual
+'
+

 test_expect_success 'no file/rev ambiguity check inside .git' '
        git commit -a -m 1 &&
        (
 test_expect_success 'no file/rev ambiguity check inside .git' '
        git commit -a -m 1 &&
        (