kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

setup: Provide GIT_PREFIX to built-ins 

GIT_PREFIX was added in 7cf16a14f5 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>
maint
David Aguilar 2011-05-25 20:37:12 -07:00 committed by Junio C Hamano
parent 7cf16a14f5
commit 1f5d271f5e
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup.c
View File

@ -602,6 +602,11 @@ const char *setup_git_directory_gently(int *nongit_ok)
const char *prefix; const char *prefix;


prefix = setup_git_directory_gently_1(nongit_ok); prefix = setup_git_directory_gently_1(nongit_ok);
if (prefix)
setenv("GIT_PREFIX", prefix, 1);
else
setenv("GIT_PREFIX", "", 1);

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

16
t/t1020-subdirectory.sh
View File

@ -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' ' test_expect_success 'no file/rev ambiguity check inside .git' '
git commit -a -m 1 && git commit -a -m 1 &&
( (