[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs lisp/ChangeLog lisp/vc-git.el nextstep/Co...
From: |
David Reitter |
Subject: |
[Emacs-diffs] emacs lisp/ChangeLog lisp/vc-git.el nextstep/Co... |
Date: |
Tue, 24 Nov 2009 15:31:06 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: David Reitter <davidswelt> 09/11/24 15:31:06
Modified files:
lisp : ChangeLog vc-git.el
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj:
InfoPlist.strings
Log message:
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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16716&r2=1.16717
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-git.el?cvsroot=emacs&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/emacs/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings?cvsroot=emacs&r1=1.11&r2=1.12
Patches:
Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16716
retrieving revision 1.16717
diff -u -b -r1.16716 -r1.16717
--- lisp/ChangeLog 24 Nov 2009 10:25:54 -0000 1.16716
+++ lisp/ChangeLog 24 Nov 2009 15:31:01 -0000 1.16717
@@ -1,3 +1,9 @@
+2009-11-24 David Reitter <address@hidden>
+
+ * 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 <address@hidden>
Improve handling of processes on remote hosts.
Index: lisp/vc-git.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-git.el,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- lisp/vc-git.el 16 Nov 2009 20:36:11 -0000 1.99
+++ lisp/vc-git.el 24 Nov 2009 15:31:06 -0000 1.100
@@ -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))
Index:
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
===================================================================
RCS file:
/sources/emacs/emacs/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
---
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
21 Jun 2009 04:46:08 -0000 1.11
+++
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
24 Nov 2009 15:31:06 -0000 1.12
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs lisp/ChangeLog lisp/vc-git.el nextstep/Co...,
David Reitter <=