# HG changeset patch # User Dan Nicolaescu # Date 1264394800 28800 # Node ID 36d87e3f3cc36f26e0158706bc0cccdcaef0d013 # Parent ffa16c09e01d869edb5881920fe1acb3df5ddd0c (vc-git-dir-status-goto-stage): Pass --relative to the diff-index command. This requires at least git-1.5.5. (Bug#1589). diff -r ffa16c09e01d -r 36d87e3f3cc3 etc/NEWS --- a/etc/NEWS Sun Jan 24 21:52:03 2010 -0500 +++ b/etc/NEWS Sun Jan 24 20:46:40 2010 -0800 @@ -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. diff -r ffa16c09e01d -r 36d87e3f3cc3 lisp/ChangeLog --- a/lisp/ChangeLog Sun Jan 24 21:52:03 2010 -0500 +++ b/lisp/ChangeLog Sun Jan 24 20:46:40 2010 -0800 @@ -1,3 +1,8 @@ +2010-01-25 Eric Hanchrow (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 Remove support for adding --signoff on commit. diff -r ffa16c09e01d -r 36d87e3f3cc3 lisp/vc-git.el --- a/lisp/vc-git.el Sun Jan 24 21:52:03 2010 -0500 +++ b/lisp/vc-git.el Sun Jan 24 20:46:40 2010 -0800 @@ -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))))