From 9e2e513ecccb320790a1f343d2ef92126eeb6b58 Mon Sep 17 00:00:00 2001
From: Katie Byers <lobsterkatie@gmail.com>
Date: Mon, 27 Feb 2023 18:18:35 -0800
Subject: [PATCH 1/2] improve logging when updating after pull

---
 config/hooks/post-merge | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/hooks/post-merge b/config/hooks/post-merge
index 01e3f164fc5e8c..0c995474ff64a9 100755
--- a/config/hooks/post-merge
+++ b/config/hooks/post-merge
@@ -15,18 +15,22 @@ grep --quiet 'yarn.lock' "$files_changed_upstream"                   && js="inst
 grep --quiet 'migrations' "$files_changed_upstream"                  && migrations="apply-migrations "
 
 [[ "$pc" || "$py" || "$js" || "$migrations" ]] && needs_update=1
-update_command="make ${pc}${py}${js}${migrations}"
 
-[[ "$needs_update" ]] && cat <<EOF
+if [[ "$needs_update" ]]; then
+  update_command="make ${pc}${py}${js}${migrations}"
+
+  cat <<EOF
 
 [${red}${bold}!!!${reset}] ${red} It looks like some dependencies have changed that will require your intervention. Run the following to update:${reset}
 
     ${red}${bold}${update_command}${reset}
 
-${yellow}If you want these commands to automatically be executed after pulling code you can export the SENTRY_POST_MERGE_AUTO_UPDATE variable.${reset}
-
 EOF
 
-if [[ "$SENTRY_POST_MERGE_AUTO_UPDATE" && "$needs_update" ]]; then
-  $update_command
+  if [[ "$SENTRY_POST_MERGE_AUTO_UPDATE" ]]; then
+    echo "${yellow}Automatically running update command because SENTRY_POST_MERGE_AUTO_UPDATE is set.${reset}"
+    $update_command
+  else
+    echo "${yellow}If you want these commands to be executed automatically after pulling code, you can export the SENTRY_POST_MERGE_AUTO_UPDATE variable.${reset}"
+  fi
 fi

From 9ead788381d0b1e5994930ac9b491c87f15b07de Mon Sep 17 00:00:00 2001
From: Katie Byers <lobsterkatie@gmail.com>
Date: Mon, 27 Feb 2023 18:19:22 -0800
Subject: [PATCH 2/2] autoformat

---
 config/hooks/post-merge | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/hooks/post-merge b/config/hooks/post-merge
index 0c995474ff64a9..053e8c57e0d022 100755
--- a/config/hooks/post-merge
+++ b/config/hooks/post-merge
@@ -8,11 +8,11 @@ reset="$(tput sgr0)"
 files_changed_upstream="$(mktemp)"
 trap "rm -f ${files_changed_upstream}" EXIT
 
-git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD > "$files_changed_upstream"
+git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD >"$files_changed_upstream"
 
 grep --quiet 'requirements-dev-frozen.txt' "$files_changed_upstream" && py="install-py-dev "
-grep --quiet 'yarn.lock' "$files_changed_upstream"                   && js="install-js-dev "
-grep --quiet 'migrations' "$files_changed_upstream"                  && migrations="apply-migrations "
+grep --quiet 'yarn.lock' "$files_changed_upstream" && js="install-js-dev "
+grep --quiet 'migrations' "$files_changed_upstream" && migrations="apply-migrations "
 
 [[ "$pc" || "$py" || "$js" || "$migrations" ]] && needs_update=1