diff --git a/tools/post-checkout b/tools/post-checkout
index 747643bffc2d55372d46d0e1cba87de8edf875bb..7d8fa3146cf618d2ba8e456aa09ee9d0b31d7810 100755
--- a/tools/post-checkout
+++ b/tools/post-checkout
@@ -26,5 +26,8 @@ IS_BRANCH_CHECKOUT=$3
 
 if which check-setuppy >/dev/null 2>&1; then
     check-setuppy --current-rev "$NEW_HEAD"
+    # Make sure we always exit with 0 return code, otherwise it might break
+    # rebasing
+    exit 0
 fi