Only auto commit if file is tracked in Git already

This commit is contained in:
Robert Irelan 2019-09-26 14:33:49 -07:00 committed by Robert Irelan
parent 848374379a
commit a4c938d6aa

View file

@ -209,6 +209,12 @@ Default to FILENAME."
(replace-regexp-in-string "\n\\'" "" (replace-regexp-in-string "\n\\'" ""
(gac--shell-command-to-string-throw "git symbolic-ref --short HEAD")))) (gac--shell-command-to-string-throw "git symbolic-ref --short HEAD"))))
(defun gac--buffer-file-tracked ()
"Is the current buffer's file tracked in Git?"
(eq 0
(call-process "git" nil nil nil "ls-files" "--error-unmatch"
(buffer-file-name))))
(defun gac--shell-command-throw (command) (defun gac--shell-command-throw (command)
"Run shell command, but raise a lisp error if the command returns nonzero. "Run shell command, but raise a lisp error if the command returns nonzero.
@ -345,7 +351,8 @@ should already have been set up."
(string= (string=
"true\n" "true\n"
(gac--shell-command-to-string-throw (gac--shell-command-to-string-throw
"git rev-parse --is-inside-work-tree"))) "git rev-parse --is-inside-work-tree"))
(gac--buffer-file-tracked))
(gac-commit buffer) (gac-commit buffer)
(gac-merge buffer) (gac-merge buffer)
(with-current-buffer buffer (with-current-buffer buffer
@ -369,7 +376,8 @@ should already have been set up."
(defun gac-before-save-func () (defun gac-before-save-func ()
"Create and check out a merge branch." "Create and check out a merge branch."
(gac-checkout-merge-branch)) (when (gac--buffer-file-tracked)
(gac-checkout-merge-branch)))
(defun gac-after-save-func () (defun gac-after-save-func ()
"Commit the current file. "Commit the current file.