git.el: Don't use --info-only when resolving a file.
It doesn't make a difference for git.el, but it helps when interacting with git-rebase and friends. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
e6d7b2f62e
commit
cdc0873a78
@ -777,7 +777,7 @@ and returns the process output as a string."
|
|||||||
(interactive)
|
(interactive)
|
||||||
(let ((files (git-marked-files-state 'unmerged)))
|
(let ((files (git-marked-files-state 'unmerged)))
|
||||||
(when files
|
(when files
|
||||||
(apply #'git-run-command nil nil "update-index" "--info-only" "--" (git-get-filenames files))
|
(apply #'git-run-command nil nil "update-index" "--" (git-get-filenames files))
|
||||||
(git-set-files-state files 'modified)
|
(git-set-files-state files 'modified)
|
||||||
(git-refresh-files))))
|
(git-refresh-files))))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user