merge

diff --git a/etc/NEWS b/etc/NEWS
index 5eb39fa..7d864d1 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -328,6 +328,8 @@ their content displayed.
 
 **** 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.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3c3455..84cfa2a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,15 @@
-2010-01-24  Mark A. Hershberger  <mah@everybody.org>
+2010-01-25  Mark A. Hershberger  <mah@everybody.org>
 
        * progmodes/python.el: Replace reference to obsolete
        c-subward-mode.
 
        * vc-bzr.el: (vc-bzr-revision-table) New function.
 
+2010-01-25  Eric Hanchrow  <eric.hanchrow@gmail.com>  (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  <dann@ics.uci.edu>
 
        Remove support for adding --signoff on commit.

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 4896f79..0d8e630 100644 (file)
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -381,7 +381,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
      (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))))