gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always use "git cmd" instead of "git-cmd".

Browse source 
The latter was deprecated and doesn't work anymore in git 1.6.
This commit is contained in:
Marius Vollmer 2008-08-18 22:07:00 +03:00
parent fff4e179b9
commit b7c1292701
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
magit.el
View file

@ -81,23 +81,23 @@
(concat (car seqs) delim (magit-concat-with-delim delim (cdr seqs)))))) (concat (car seqs) delim (magit-concat-with-delim delim (cdr seqs))))))
(defun magit-get (&rest keys) (defun magit-get (&rest keys)
(magit-shell "git-config %s" (magit-concat-with-delim "." keys))) (magit-shell "git config %s" (magit-concat-with-delim "." keys)))
(defun magit-set (val &rest keys) (defun magit-set (val &rest keys)
(if val (if val
(magit-shell "git-config %s %s" (magit-concat-with-delim "." keys) val) (magit-shell "git config %s %s" (magit-concat-with-delim "." keys) val)
(magit-shell "git-config --unset %s" (magit-concat-with-delim "." keys)))) (magit-shell "git config --unset %s" (magit-concat-with-delim "." keys))))
(defun magit-get-top-dir (cwd) (defun magit-get-top-dir (cwd)
(let* ((cwd (expand-file-name cwd)) (let* ((cwd (expand-file-name cwd))
(magit-dir (magit-shell "cd '%s' && git-rev-parse --git-dir 2>/dev/null" (magit-dir (magit-shell "cd '%s' && git rev-parse --git-dir 2>/dev/null"
cwd))) cwd)))
(if magit-dir (if magit-dir
(file-name-as-directory (or (file-name-directory magit-dir) cwd)) (file-name-as-directory (or (file-name-directory magit-dir) cwd))
nil))) nil)))
(defun magit-get-ref (ref) (defun magit-get-ref (ref)
(magit-shell "git-symbolic-ref -q %s" ref)) (magit-shell "git symbolic-ref -q %s" ref))
(defun magit-get-current-branch () (defun magit-get-current-branch ()
(let* ((head (magit-get-ref "HEAD")) (let* ((head (magit-get-ref "HEAD"))
@ -661,7 +661,7 @@ pushed.
(defun magit-stage-all () (defun magit-stage-all ()
(interactive) (interactive)
(magit-run "git-add" "-u" ".")) (magit-run "git" "add" "-u" "."))
;;; Branches ;;; Branches
@ -777,7 +777,7 @@ pushed.
(write-region (point-min) (point-max) ".git/magit-log") (write-region (point-min) (point-max) ".git/magit-log")
(write-region "(Empty description)" nil ".git/magit-log")) (write-region "(Empty description)" nil ".git/magit-log"))
(erase-buffer) (erase-buffer)
(magit-run "git-commit" "-F" ".git/magit-log") (magit-run "git" "commit" "-F" ".git/magit-log")
(bury-buffer) (bury-buffer)
(when magit-pre-log-edit-window-configuration (when magit-pre-log-edit-window-configuration
(set-window-configuration magit-pre-log-edit-window-configuration) (set-window-configuration magit-pre-log-edit-window-configuration)