Commit 35179414 authored by David Reitter's avatar David Reitter
Browse files

vc-git-registered: use checkout directory (where .git is)

rather than the file's directory and a relative path spec to work around a bug in git.
parent 605a20a9
2009-11-24 David Reitter <david.reitter@gmail.com>
* vc-git.el (vc-git-registered): use checkout directory (where
.git is) rather than the file's directory and a relative path spec
to work around a bug in git.
2009-11-24 Michael Albinus <michael.albinus@gmx.de>
Improve handling of processes on remote hosts.
......
......@@ -147,7 +147,11 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(when (vc-git-root file)
(with-temp-buffer
(let* (process-file-side-effects
(dir (file-name-directory file))
;; do not use the `file-name-directory' here: git-ls-files
;; sometimes fails to return the correct status for relative
;; path specs.
;; see also: http://marc.info/?l=git&m=125787684318129&w=2
(dir (vc-git-root file))
(name (file-relative-name file dir))
(str (ignore-errors
(when dir (cd dir))
......
/* Localized versions of Info.plist keys */
<<<<<<< InfoPlist.strings
=======
CFBundleName = "Emacs";
CFBundleShortVersionString = "Version 23.1.50";
CFBundleGetInfoString = "Emacs version 23.1.50, NS Windowing";
NSHumanReadableCopyright = "Copyright (C) 2009 Free Software Foundation, Inc.";
>>>>>>> 1.7
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment