From 497846d74010eab57d3f9f7283f3b216e965d9c5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 26 Oct 2018 14:37:43 -0400 Subject: [PATCH] don't probe support for git-annex smudge --update Any git-annex not supporting that doesn't support v7 repositories, so will refuse to work in a repository that has this hook installed. --- Annex/Hook.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Annex/Hook.hs b/Annex/Hook.hs index 55826d8182..c4ed790528 100644 --- a/Annex/Hook.hs +++ b/Annex/Hook.hs @@ -38,10 +38,10 @@ postCheckoutHook = Git.Hook "post-checkout" smudgeHook [] postMergeHook :: Git.Hook postMergeHook = Git.Hook "post-merge" smudgeHook [] --- Only run git-annex smudge --update when git-annex supports it. --- Older versions of git-annex didn't need this hook. +-- Older versions of git-annex didn't support this command, but neither did +-- they support v7 repositories. smudgeHook :: String -smudgeHook = mkHookScript "if git annex smudge --update >/dev/null 2>&1; then git-annex smudge --update; fi" +smudgeHook = mkHookScript "git annex smudge --update" preCommitAnnexHook :: Git.Hook preCommitAnnexHook = Git.Hook "pre-commit-annex" "" []