Mercurial > emacs
changeset 106983:36d87e3f3cc3
(vc-git-dir-status-goto-stage): Pass --relative to the
diff-index command. This requires at least git-1.5.5. (Bug#1589).
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 24 Jan 2010 20:46:40 -0800 |
| parents | ffa16c09e01d |
| children | 61edd42cf483 |
| files | etc/NEWS lisp/ChangeLog lisp/vc-git.el |
| diffstat | 3 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 <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.
--- 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))))