Merge pull request #9794 from ustaxcourt/devex-postmerge-againagain

devex: fix husky post-merge

Author: jimlerza

.husky/post-merge

@@ -64,7 +64,7 @@ EFCMS_ROOT=$(realpath "$(dirname "$0")/..")
 
 if [ -f "CHANGES.md" ]; then
   CHANGES_DIFF=$(git diff ORIG_HEAD HEAD -- CHANGES.md 2>/dev/null)
-  ADDED_LINES=$(printf "%s\n" "$CHANGES_DIFF" | grep "^+" | grep -v "^+++" | grep -v "No newline")
+  ADDED_LINES=$(printf "%s\n" "$CHANGES_DIFF" | grep "^+" | grep -v "^+++" | grep -v "No newline" || true)
 
   if [ -n "$ADDED_LINES" ]; then
     {

.husky/post-merge.test.sh

@@ -3,10 +3,12 @@
 # test-post-merge.sh: A script to simulate a git merge and test the post-merge hook.
 
 EFCMS_ROOT=$(realpath "$(dirname "$0")/..")
+ANY_ERROR=0
 
 set -e
 
 GREEN='\033[0;32m'
+RED='\033[0;31m'
 NC='\033[0m' # No Color
 
 echo -e "${GREEN}Setting up test environment...${NC}"
@@ -29,6 +31,32 @@ git config user.name "Test User"
 git add CHANGES.md
 git commit -m "Initial commit to the main branch" -q
 
+git checkout -b no-changes -q
+echo "some text" > some-other-file.txt
+git add some-other-file.txt
+git commit -m "Add a file that is not CHANGES.md" -q
+
+git checkout main -q
+mkdir -p .husky
+cp "${EFCMS_ROOT}/.husky/post-merge" .husky/post-merge
+chmod +x .husky/post-merge
+
+echo -e "${GREEN}Simulating merge of 'no-changes' into 'main'...${NC}"
+PRE_MERGE_HEAD=$(git rev-parse HEAD)
+git merge no-changes --no-edit -q
+git update-ref ORIG_HEAD "$PRE_MERGE_HEAD"
+
+echo -e "${GREEN}Executing post-merge hook...${NC}"
+./.husky/post-merge
+EXIT_CODE="$?"
+
+if [[ "$EXIT_CODE" -eq 0 ]]; then
+  echo -e "${GREEN}Exited with status ${EXIT_CODE}.${NC}"
+else
+  ANY_ERROR=1
+  echo -e "${RED}Exited with status ${EXIT_CODE}.${NC}"
+fi
+
 git checkout -b throwaway -q
 {
   echo ""
@@ -43,12 +71,20 @@ mkdir -p .husky
 cp "${EFCMS_ROOT}/.husky/post-merge" .husky/post-merge
 chmod +x .husky/post-merge
 
-
 echo -e "${GREEN}Simulating merge of 'throwaway' into 'main'...${NC}"
 PRE_MERGE_HEAD=$(git rev-parse HEAD)
 git merge throwaway --no-edit -q
 git update-ref ORIG_HEAD "$PRE_MERGE_HEAD"
 
 echo -e "${GREEN}Executing post-merge hook...${NC}"
 ./.husky/post-merge
-echo -e "${GREEN}Test complete.${NC}"
+EXIT_CODE="$?"
+
+if [[ "$EXIT_CODE" -eq 0 ]]; then
+  echo -e "${GREEN}Exited with status ${EXIT_CODE}.${NC}"
+else
+  ANY_ERROR=1
+  echo -e "${RED}Exited with status ${EXIT_CODE}.${NC}"
+fi
+
+[[ "$ANY_ERROR" -eq 0 ]] && echo -e "${GREEN}Test complete.${NC}" || echo -e "${RED}Test complete with error(s).${NC}"