Mercurial > emacs
changeset 106220:a88a54e96796
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.
| author | David Reitter <david.reitter@gmail.com> |
|---|---|
| date | Tue, 24 Nov 2009 15:31:01 +0000 |
| parents | 16b061d2742d |
| children | 6c0524d168f6 |
| files | lisp/ChangeLog lisp/vc-git.el nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings |
| diffstat | 3 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Nov 24 10:25:54 2009 +0000 +++ b/lisp/ChangeLog Tue Nov 24 15:31:01 2009 +0000 @@ -1,3 +1,9 @@ +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.
--- a/lisp/vc-git.el Tue Nov 24 10:25:54 2009 +0000 +++ b/lisp/vc-git.el Tue Nov 24 15:31:01 2009 +0000 @@ -147,7 +147,11 @@ (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))
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings Tue Nov 24 10:25:54 2009 +0000 +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings Tue Nov 24 15:31:01 2009 +0000 @@ -1,6 +1,8 @@ -/* 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