From d5c94dcf5c0efa3510d27af6b1bd1d33c8171ae9 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 28 Aug 2021 00:46:34 +0300
Subject: [PATCH] Keep going in the git hook.

In some hosts I don't want private information stored locally. Keep
going with Make target in the post-merge Git hook and ignore errors.
---
 .githooks/post-merge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.githooks/post-merge b/.githooks/post-merge
index d0978d1..f438306 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -5,7 +5,7 @@ notify () { printf '\n\e[1;94m=== %s ====\e[0m\n\n' "$1" >&2; }
 
 cd "$(git rev-parse --show-toplevel)"
 notify 'Generating some configuration and private files.'
-make --directory "$HOME" --always-make
+make --directory "$HOME" --always-make --keep-going || true
 notify 'Installing Git hooks'
 Documents/bin/install-git-hooks
 notify 'Loading dconf config'
-- 
GitLab