procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vc-git-state: Bring back CentOS 6 compatibility

Browse source 
* lisp/vc/vc-git.el (vc-git-state):
Bring back CentOS 6 compatibility (bug#19343).
This commit is contained in:
Dmitry Gutov 2017-05-01 17:58:57 +03:00
parent 6c9ec085e2
commit 0c76f94693
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/vc/vc-git.el
View file

@ -268,9 +268,28 @@ in the order given by 'git status'."
(defun vc-git-state (file)
"Git-specific version of `vc-state'."
;; FIXME: Still can't detect `ignored', see below, and returns
;; `up-to-date' instead. Which is rarely a problem because
;; `vc-backend' returns nil for ignored files.
;;
;; It also can't set `needs-update' or `needs-merge'. The rough
;; equivalent would be that upstream branch for current branch is in
;; fast-forward state i.e. current branch is direct ancestor of
;; corresponding upstream branch, and the file was modified
;; upstream. We'd need to check against the upstream tracking
;; branch for that (an extra process call or two).
(let ((status
(vc-git--run-command-string file "status" "--porcelain" "-z"
"--untracked-files" "--ignored" "--")))
;; Just to be explicit, it's the
;; default anyway.
"--untracked-files"
;; Requires Git 1.7.6.3 or so,
;; so does not work in CentOS 6
;; "--ignored"
"--")))
;; Alternatively, the `ignored' state could be detected with 'git
;; ls-files -i -o --exclude-standard', but that's an extra process
;; call, and the `ignored' state is rarely needed.
(if (null status)
;; If status is nil, there was an error calling git, likely because
;; the file is not in a git repo.