(vc-p4-find-p4config): Convert the directory in which we're searching
to an absolute path by calling expand-file-name on it, because file-name-directory doesn't do what we expect for relative paths ((file-name-directory "..") returns nil, when we're expecting it to eventually return "/"). [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1328]
This commit is contained in:
parent
35d746c591
commit
c3ee00c06d
1 changed files with 1 additions and 1 deletions
2
vc-p4.el
2
vc-p4.el
|
@ -786,7 +786,7 @@ as a floating point fractional number of days."
|
||||||
(defun vc-p4-find-p4config (&optional dirname)
|
(defun vc-p4-find-p4config (&optional dirname)
|
||||||
"See if there is a $P4CONFIG file in DIRNAME or any of its parents.
|
"See if there is a $P4CONFIG file in DIRNAME or any of its parents.
|
||||||
If DIRNAME is not specified, uses `default-directory'."
|
If DIRNAME is not specified, uses `default-directory'."
|
||||||
(let ((this-directory (or dirname default-directory))
|
(let ((this-directory (expand-file-name (or dirname default-directory)))
|
||||||
(p4config (getenv "P4CONFIG"))
|
(p4config (getenv "P4CONFIG"))
|
||||||
child)
|
child)
|
||||||
(if (not p4config)
|
(if (not p4config)
|
||||||
|
|
Loading…
Reference in a new issue