diff options
| author | Eric Hanchrow | 2010-01-24 20:46:40 -0800 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-01-24 20:46:40 -0800 |
| commit | 504dcc71eb779d08d3e4caa0c932f3041148b198 (patch) | |
| tree | b4701516e5c0ff1f076fadd7b7c2c369cc7c36db /lisp | |
| parent | 8dc1adf681df162bfd305debef0e1ab31bed3ebd (diff) | |
| download | emacs-504dcc71eb779d08d3e4caa0c932f3041148b198.tar.gz emacs-504dcc71eb779d08d3e4caa0c932f3041148b198.zip | |
(vc-git-dir-status-goto-stage): Pass --relative to the
diff-index command. This requires at least git-1.5.5. (Bug#1589).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-git.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa3761738bf..085c082cadb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-01-25 Eric Hanchrow <eric.hanchrow@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * vc-git.el (vc-git-dir-status-goto-stage): Pass --relative to the | ||
| 4 | diff-index command. This requires at least git-1.5.5. (Bug#1589). | ||
| 5 | |||
| 1 | 2010-01-24 Dan Nicolaescu <dann@ics.uci.edu> | 6 | 2010-01-24 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 7 | ||
| 3 | Remove support for adding --signoff on commit. | 8 | 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." | |||
| 381 | (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" "-i" | 381 | (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" "-i" |
| 382 | "--directory" "--no-empty-directory" "--exclude-standard" "--")) | 382 | "--directory" "--no-empty-directory" "--exclude-standard" "--")) |
| 383 | ('diff-index | 383 | ('diff-index |
| 384 | (vc-git-command (current-buffer) 'async files "diff-index" "-z" "-M" "HEAD" "--"))) | 384 | (vc-git-command (current-buffer) 'async files "diff-index" "--relative" "-z" "-M" "HEAD" "--"))) |
| 385 | (vc-exec-after | 385 | (vc-exec-after |
| 386 | `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote ,update-function)))) | 386 | `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote ,update-function)))) |
| 387 | 387 | ||