fix(#131): 🐛 issue with hook when amend or rebase

AndreasAugustin · May 24, 2024 · ae4ef15 · ae4ef15
1 parent cc98791
commit ae4ef15
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/pkg/hooks.go b/pkg/hooks.go
@@ -21,11 +21,16 @@ var hookFileScript = `#!/bin/sh
 hookName=` + "`basename \"$0\"`" + `
 gitParams="$*"
 
-IS_AMEND=$(ps -ocommand= -p $PPID | grep -e '--amend');
+GIT_CMD=$(ps -ocommand= -p $PPID);
+IS_AMEND=$(echo "${GIT_CMD}" | grep -e '--amend');
+IS_REBASE=$(echo "${GIT_CMD}" | grep -e 'rebase');
 
 if [ -n "$IS_AMEND" ]; then
  echo "Using amend, skipping use of go-gitmoji-cli"
  exit 0;
+elif [ -n "$IS_REBASE" ]; then
+ echo "Using rebase, skipping use of go-gitmoji-cli"
+ exit 0;
 fi
 
 if command -v go-gitmoji-cli >/dev/null 2>&1; then

diff --git a/pkg/hooks_test.go b/pkg/hooks_test.go
@@ -28,11 +28,16 @@ var expHookFileScript = `#!/bin/sh
 hookName=` + "`basename \"$0\"`" + `
 gitParams="$*"
 
-IS_AMEND=$(ps -ocommand= -p $PPID | grep -e '--amend');
+GIT_CMD=$(ps -ocommand= -p $PPID);
+IS_AMEND=$(echo "${GIT_CMD}" | grep -e '--amend');
+IS_REBASE=$(echo "${GIT_CMD}" | grep -e 'rebase');
 
 if [ -n "$IS_AMEND" ]; then
  echo "Using amend, skipping use of go-gitmoji-cli"
  exit 0;
+elif [ -n "$IS_REBASE" ]; then
+ echo "Using rebase, skipping use of go-gitmoji-cli"
+ exit 0;
 fi
 
 if command -v go-gitmoji-cli >/dev/null 2>&1; then