[Emacs-diffs] /srv/bzr/emacs/trunk r99381: merge

[Mark A. Hershberger]

------------------------------------------------------------
revno: 99381 [merge]
committer: Mark A. Hershberger <address@hidden>
branch nick: trunk
timestamp: Mon 2010-01-25 00:03:35 -0500
message:
  merge
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/vc-git.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-01-24 21:23:17 +0000
+++ b/etc/NEWS  2010-01-25 04:46:40 +0000
@@ -328,6 +328,8 @@
 
 **** vc-dir displays the stash status
 
+**** vc-dir requires at least git-1.5.5.
+
 *** vc-bzr supports operating with shelves: the shelve list is
 displayed in the *vc-dir* header, shelves can be created, removed and applied.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-25 05:02:10 +0000
+++ b/lisp/ChangeLog    2010-01-25 05:03:35 +0000
@@ -1,10 +1,15 @@
-2010-01-24  Mark A. Hershberger  <address@hidden>
+2010-01-25  Mark A. Hershberger  <address@hidden>
 
        * progmodes/python.el: Replace reference to obsolete
        c-subward-mode.
 
        * vc-bzr.el: (vc-bzr-revision-table) New function.
 
+2010-01-25  Eric Hanchrow  <address@hidden>  (tiny change)
+
+       * vc-git.el (vc-git-dir-status-goto-stage): Pass --relative to the
+       diff-index command.  This requires at least git-1.5.5.  (Bug#1589).
+
 2010-01-24  Dan Nicolaescu  <address@hidden>
 
        Remove support for adding --signoff on commit.

=== modified file 'lisp/vc-git.el'
--- a/lisp/vc-git.el    2010-01-24 21:23:17 +0000
+++ b/lisp/vc-git.el    2010-01-25 04:46:40 +0000
@@ -381,7 +381,7 @@
      (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" "-i"
                      "--directory" "--no-empty-directory" "--exclude-standard" 
"--"))
     ('diff-index
-     (vc-git-command (current-buffer) 'async files "diff-index" "-z" "-M" 
"HEAD" "--")))
+     (vc-git-command (current-buffer) 'async files "diff-index" "--relative" 
"-z" "-M" "HEAD" "--")))
   (vc-exec-after
    `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote 
,update-function))))