branch: elpa/magit
commit 03dc627696873658c662980d5f05c7317d3a9131
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Remove support for Git hooks not used by Magit
Only keep the hook Magit itself uses. Going forward it will be easier
for users to define such hooks themselves.
---
git-hooks/post-commit | 2 +-
git-hooks/post-merge | 2 +-
git-hooks/post-rewrite | 2 +-
lisp/magit-commit.el | 30 ------------------------------
4 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/git-hooks/post-commit b/git-hooks/post-commit
index 79b9aa0e9b..e02e5e7c3f 100755
--- a/git-hooks/post-commit
+++ b/git-hooks/post-commit
@@ -4,7 +4,7 @@ if [[ "$INSIDE_EMACS" == *magit ]]
then
for arg in "$@"; do args+="\"$arg\""; done
$GIT_EDITOR --eval \
- "(magit-run-git-hook '(common-post-commit post-commit) ${args[@]})"
+ "(magit-run-git-hook 'common-post-commit ${args[@]})"
fi
if [[ -x "$SHADOWED_GITHOOK_DIRECTORY" ]]
diff --git a/git-hooks/post-merge b/git-hooks/post-merge
index 5716dee029..e02e5e7c3f 100755
--- a/git-hooks/post-merge
+++ b/git-hooks/post-merge
@@ -4,7 +4,7 @@ if [[ "$INSIDE_EMACS" == *magit ]]
then
for arg in "$@"; do args+="\"$arg\""; done
$GIT_EDITOR --eval \
- "(magit-run-git-hook '(common-post-commit post-merge) ${args[@]})"
+ "(magit-run-git-hook 'common-post-commit ${args[@]})"
fi
if [[ -x "$SHADOWED_GITHOOK_DIRECTORY" ]]
diff --git a/git-hooks/post-rewrite b/git-hooks/post-rewrite
index 128ddaaa2e..e02e5e7c3f 100755
--- a/git-hooks/post-rewrite
+++ b/git-hooks/post-rewrite
@@ -4,7 +4,7 @@ if [[ "$INSIDE_EMACS" == *magit ]]
then
for arg in "$@"; do args+="\"$arg\""; done
$GIT_EDITOR --eval \
- "(magit-run-git-hook '(common-post-commit post-rewrite) ${args[@]})"
+ "(magit-run-git-hook 'common-post-commit ${args[@]})"
fi
if [[ -x "$SHADOWED_GITHOOK_DIRECTORY" ]]
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index c79a90a117..6d1c1541ec 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -107,36 +107,6 @@ The functions are called with the same arguments as the
Git hook.
This hook is still experimental.")
-(defvar magit-git-post-commit-functions nil
- "Hook run by Git hook `post-commit'.
-
-This hook is run if `magit-overriding-githook-directory' is non-nil.
-The functions are called with the same arguments as the Git hook.
-
-See also `magit-common-git-post-commit-functions'.
-
-This hook is still experimental.")
-
-(defvar magit-git-post-merge-functions nil
- "Hook run by Git hook `post-merge'.
-
-This hook is run if `magit-overriding-githook-directory' is non-nil.
-The functions are called with the same arguments as the Git hook.
-
-See also `magit-common-git-post-commit-functions'.
-
-This hook is still experimental.")
-
-(defvar magit-git-post-rewrite-functions nil
- "Hook run by Git hook `post-rewrite'.
-
-This hook is run if `magit-overriding-githook-directory' is non-nil.
-The functions are called with the same arguments as the Git hook.
-
-See also `magit-common-git-post-commit-functions'.
-
-This hook is still experimental.")
-
;;; Popup
;;;###autoload(autoload 'magit-commit "magit-commit" nil t)
