git - 如果在 git 中使用 hook 存在 Unresolved 冲突，如何防止推送？

Question

我想预接收 Hook 可能会有所帮助。
我觉得

#!/bin/sh
read old_sha1 new_sha1 refname
git diff $old_sha1..$new_sha1 may 

帮助找出冲突标记。
但是如何使用正则表达式或其他判断此提交中是否存在 Unresolved 冲突？冲突呈现如下:

<<<<<<< HEAD
Conflict resolution is hard;
let's go shopping.
=======
Git makes conflict resolution easy.
>>>>>>> d7785deagea4342532g2q632y321632g23h23

Answer 1

#!/bin/bash
read old_sha new_sha refname
if git diff "$old_sha" "$new_sha" | grep -qE '^[+]?(<<<<<|>>>>>)'; then
    echo "Saw a conflict marker in $(basename "$refname")."
    exit 1
fi