no early return

LarsEckart · Apr 24, 2024 · 0534e1a · 0534e1a
1 parent a4983ca
commit 0534e1a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/githooks/prepare-commit-msg b/githooks/prepare-commit-msg
@@ -2,18 +2,17 @@
 FILE=$1
 MESSAGE=$(cat $FILE)
 TICKET=$(git rev-parse --abbrev-ref HEAD | grep -Eo '^(\w+/)?\w+[-_][0-9]+' | grep -Eo '\w+[-][0-9]+' | tr "[:lower:]" "[:upper:]")
-if [[ $TICKET == "" ]];then
-  echo 'Branch name without ticket information, keeping git message as is.'
-  exit 0;
-fi
-if [[ $MESSAGE == "Merge"* ]];then
-  echo 'Merge commit, keeping git message as is.'
-  exit 0;
-fi
-if [[ "$MESSAGE" == "$TICKET"* ]];then
-  echo 'ticket information already present, keeping git message as is.'
-  exit 0;
-fi
 
 
-echo "$TICKET $MESSAGE" > $FILE
+if [[ $TICKET == "" ]]; then
+  echo 'Branch name without ticket information, keeping git message as is.'
+else
+  if [[ $MESSAGE == "Merge"* ]]; then
+    echo 'Merge commit, keeping git message as is.'
+  elif [[ "$MESSAGE" == "$TICKET"* ]]; then
+    echo 'Ticket information already present, keeping git message as is.'
+  else
+    # Prepend the ticket information only if conditions are met
+    echo "$TICKET $MESSAGE" > $FILE
+  fi
+fi
diff --git a/githooks/prepare-commit-msg-james b/githooks/prepare-commit-msg-james
@@ -4,21 +4,22 @@ MESSAGE=$(cat $FILE)
 TICKET=$(git rev-parse --abbrev-ref HEAD | grep -Eo '^(\w+/)?\w+[-_][0-9]+' | grep -Eo '\w+[-][0-9]+' | tr "[:lower:]" "[:upper:]")
 
 # Define the Co-Author information
-CO_AUTHOR="\n\nCo-Authored-By: James Skarzinskas <james@jskarzin.org>"
+CO_AUTHOR="\n\n\nCo-Authored-By: James Skarzinskas <james@jskarzin.org>"
 
 if [[ $TICKET == "" ]]; then
   echo 'Branch name without ticket information, keeping git message as is.'
-  exit 0;
-fi
-if [[ $MESSAGE == "Merge"* ]]; then
-  echo 'Merge commit, keeping git message as is.'
-  exit 0;
-fi
-if [[ "$MESSAGE" == "$TICKET"* ]]; then
-  echo 'Ticket information already present, keeping git message as is.'
-  exit 0;
+else
+  if [[ $MESSAGE == "Merge"* ]]; then
+    echo 'Merge commit, keeping git message as is.'
+  elif [[ "$MESSAGE" == "$TICKET"* ]]; then
+    echo 'Ticket information already present, keeping git message as is.'
+  else
+    # Prepend the ticket information only if conditions are met
+    echo "$TICKET $MESSAGE" > $FILE
+  fi
 fi
 
-# Append ticket information and co-author information
-echo "$TICKET $MESSAGE" > $FILE
+# Append Co-Author information unconditionally
 echo "$CO_AUTHOR" >> $FILE
+
+echo 'Co-author information added.'