summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorGary Gibbons <ggibbons@perforce.com>2011-12-09 23:48:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-12 05:13:52 (GMT)
commitbf1d68ff4c86f6d6fb3214ae9b0dc9c7ac0ff781 (patch)
tree2d6f597a9df2e7cc6cf95c83a1804c51a713e84d /contrib/fast-import
parentc145225a35c4975ae922b1906ae07c3fb44b7e07 (diff)
downloadgit-bf1d68ff4c86f6d6fb3214ae9b0dc9c7ac0ff781.zip
git-bf1d68ff4c86f6d6fb3214ae9b0dc9c7ac0ff781.tar.gz
git-bf1d68ff4c86f6d6fb3214ae9b0dc9c7ac0ff781.tar.bz2
git-p4: use absolute directory for PWD env var
P4 only looks at the environment variable $PWD to figure out where it is, so chdir() has code to set that every time. But when the clone --destination is not an absolute path, PWD will not be absolute and P4 won't be able to find any files expected to be in the current directory. Fix this by expanding PWD to an absolute path. One place this crops up is when using a P4CONFIG environment variable to specify P4 parameters, such as P4USER or P4PORT. Setting P4CONFIG=.p4config works for p4 invocations from the current directory. But if the value of PWD is not absolute, it fails. [ update description --pw ] Signed-off-by: Gary Gibbons <ggibbons@perforce.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p45
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 122b7c2..7d8e74b 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -53,9 +53,10 @@ def p4_build_cmd(cmd):
def chdir(dir):
# P4 uses the PWD environment variable rather than getcwd(). Since we're
- # not using the shell, we have to set it ourselves.
- os.environ['PWD']=dir
+ # not using the shell, we have to set it ourselves. This path could
+ # be relative, so go there first, then figure out where we ended up.
os.chdir(dir)
+ os.environ['PWD'] = os.getcwd()
def die(msg):
if verbose: