mirror of
https://github.com/git/git.git
synced 2024-11-05 22:19:47 +01:00
bbd848633e
The generic chdir() helper sets the PWD environment
variable, as that is what is used by p4 to know its
current working directory. Normally the shell would
do this, but in git-p4, we must do it by hand.
However, when the path contains a symbolic link,
os.getcwd() will return the physical location. If the
p4 client specification includes symlinks, setting PWD
to the physical location causes p4 to think it is not
inside the client workspace. It complains, e.g.
Path /vol/bar/projects/foo/... is not under client root /p/foo
One workaround is to use AltRoots in the p4 client specification,
but it is cleaner to handle it directly in git-p4.
Other uses of chdir still require setting PWD to an
absolute path so p4 features like P4CONFIG work. See
bf1d68f (git-p4: use absolute directory for PWD env
var, 2011-12-09).
[ pw: tweak patch and commit message ]
Thanks-to: John Keeping <john@keeping.me.uk>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
91 lines
2.3 KiB
Bash
Executable File
91 lines
2.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 relative chdir'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'init depot' '
|
|
(
|
|
cd "$cli" &&
|
|
echo file1 >file1 &&
|
|
p4 add file1 &&
|
|
p4 submit -d "change 1"
|
|
)
|
|
'
|
|
|
|
# P4 reads from P4CONFIG file to find its server params, if the
|
|
# environment variable is set
|
|
test_expect_success 'P4CONFIG and absolute dir clone' '
|
|
printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
|
|
test_when_finished "rm p4config" &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
P4CONFIG=p4config && export P4CONFIG &&
|
|
sane_unset P4PORT P4CLIENT &&
|
|
git p4 clone --verbose --dest="$git" //depot
|
|
)
|
|
'
|
|
|
|
# same thing, but with relative directory name, note missing $ on --dest
|
|
test_expect_success 'P4CONFIG and relative dir clone' '
|
|
printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
|
|
test_when_finished "rm p4config" &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
P4CONFIG=p4config && export P4CONFIG &&
|
|
sane_unset P4PORT P4CLIENT &&
|
|
git p4 clone --verbose --dest="git" //depot
|
|
)
|
|
'
|
|
|
|
# Common setup using .p4config to set P4CLIENT and P4PORT breaks
|
|
# if clone destination is relative. Make sure that chdir() expands
|
|
# the relative path in --dest to absolute.
|
|
test_expect_success 'p4 client root would be relative due to clone --dest' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
echo P4PORT=$P4PORT >git/.p4config &&
|
|
P4CONFIG=.p4config &&
|
|
export P4CONFIG &&
|
|
unset P4PORT &&
|
|
git p4 clone --dest="git" //depot
|
|
)
|
|
'
|
|
|
|
# When the p4 client Root is a symlink, make sure chdir() does not use
|
|
# getcwd() to convert it to a physical path.
|
|
test_expect_success SYMLINKS 'p4 client root symlink should stay symbolic' '
|
|
physical="$TRASH_DIRECTORY/physical" &&
|
|
symbolic="$TRASH_DIRECTORY/symbolic" &&
|
|
test_when_finished "rm -rf \"$physical\"" &&
|
|
test_when_finished "rm \"$symbolic\"" &&
|
|
mkdir -p "$physical" &&
|
|
ln -s "$physical" "$symbolic" &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
P4CLIENT=client-sym &&
|
|
p4 client -i <<-EOF &&
|
|
Client: $P4CLIENT
|
|
Description: $P4CLIENT
|
|
Root: $symbolic
|
|
LineEnd: unix
|
|
View: //depot/... //$P4CLIENT/...
|
|
EOF
|
|
git p4 clone --dest="$git" //depot &&
|
|
cd "$git" &&
|
|
test_commit file2 &&
|
|
git config git-p4.skipSubmitEdit true &&
|
|
git p4 submit
|
|
)
|
|
'
|
|
|
|
test_expect_success 'kill p4d' '
|
|
kill_p4d
|
|
'
|
|
|
|
test_done
|