From 504dcc71eb779d08d3e4caa0c932f3041148b198 Mon Sep 17 00:00:00 2001 From: Eric Hanchrow Date: Sun, 24 Jan 2010 20:46:40 -0800 Subject: [PATCH] (vc-git-dir-status-goto-stage): Pass --relative to the diff-index command. This requires at least git-1.5.5. (Bug#1589). --- etc/NEWS | 2 ++ lisp/ChangeLog | 5 +++++ lisp/vc-git.el | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/etc/NEWS b/etc/NEWS index 5eb39faf6ba..7d864d15fd5 100644 --- 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 fa3761738bf..085c082cadb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/vc-git.el b/lisp/vc-git.el index 4896f79a395..0d8e6307d6e 100644 --- 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)))) -- 2.39.5