Browse Source

update eshell/git

pull/1/head
10sr 10 years ago
parent
commit
ae25d3516c
1 changed files with 19 additions and 2 deletions
  1. +19
    -2
      emacs.el

+ 19
- 2
emacs.el View File

@@ -1719,7 +1719,7 @@ Optional prefix ARG says how many lines to unflag; default is one line."
nil
"List of git commands that cat just return strings as results.")
(setq eshell/git-cat-command
'("status" "st")
'("status" "st" "b" "branch" "ls" "ls-files")
)


@@ -1727,14 +1727,31 @@ Optional prefix ARG says how many lines to unflag; default is one line."
(if (member (car args)
eshell/git-cat-command)
(shell-command-to-string (mapconcat 'shell-quote-argument
`("git" ,@args)
`("git"
"-c"
"color.ui=always"
,@args)
" "))
;; (eshell-git-shell-command-to-string args)
(if (require 'git-command nil t)
(git-command (mapconcat 'shell-quote-argument
args
" "))
(apply 'eshell-exec-visual "git" args))))

;; (defun eshell-git-shell-command-to-string (args)
;; "Return string of output of ARGS."
;; (let ((sargs (mapconcat 'shell-quote-argument
;; args
;; " ")))
;; (if (require 'ansi-color nil t)
;; (identity
;; (shell-command-to-string (concat "git "
;; "-c color.ui=always "
;; sargs)))
;; (shell-command-to-string (concat "git "
;; sargs)))))

(defalias 'eshell/g 'eshell/git)

(defalias 'eshell/: 'ignore)


Loading…
Cancel
Save