Merge pull request #11 from Kpler/fix-linearity

fix: configure target branch

Author: gregoirechauvet

README.md

@@ -7,20 +7,29 @@ Some out-of-the-box hooks for [pre-commit](https://github.com/pre-commit/pre-com
 
 Add this to your `.pre-commit-config.yaml`
 
+```yaml
     -   repo: https://github.com/Kpler/kp-pre-commit-hooks.git
         rev: v0.0.7  # Use the ref you want to point at
         hooks:
         -   id: check-branch-linearity
         -   id: check-branch-name
         -   id: no-ephemeral-links
             exclude: '\.md$'
+```
 
 ### Hooks available
 
 #### `check-branch-linearity`
-Simply check that your branch doesn't not contain any merge compare to `master` or `main` branch.
+Simply check that your branch doesn't not contain any merge compare to a target branch, `master` by default.
 It's a pre-push hook and will always run
 
+To configure the target branch:
+```yaml
+    hooks:
+    -   id: check-branch-linearity
+        args: [targetbranch]
+```
+
 #### `check-branch-name`
 Check that branch name is less than 70 characters
 It's a pre-push hook and will always run

git-branch-linearity.sh

@@ -1,8 +1,10 @@
 #!/bin/sh
 
-git fetch origin main:refs/remotes/origin/main 2> /dev/null
-if [ $? -eq 0 ]; then TARGET_BRANCH="main"; else TARGET_BRANCH="master"; fi
+# Use parameter passed to the script or default to master
+TARGET_BRANCH="${1:-master}"
+
 echo "Target branch: $TARGET_BRANCH"
+git fetch origin $TARGET_BRANCH 2> /dev/null
 
 out=$(git log origin/${TARGET_BRANCH}..HEAD --merges --oneline)
 exit_status=$?