From f21cdcba5e4a6e5c472e93421b96ea85ad6c4376 Mon Sep 17 00:00:00 2001 From: Lilli Szafranski Date: Fri, 17 Jan 2025 15:42:26 -0800 Subject: [PATCH] Remove calls to hooks-check.sh now that we've deleted it (#133) ## Summary: See this PR: https://github.com/Khan/webapp/pull/28336, and this thread: https://khanacademy.slack.com/archives/C013ANU53LK/p1737054500403279 Issue: FEI-6073 ## Test plan: Test the aliases that were affected Author: lillialexis Reviewers: csilvers, somewhatabstract Required Reviewers: Approved By: csilvers, somewhatabstract Checks: Pull Request URL: https://github.com/Khan/khan-dotfiles/pull/133 --- .gitconfig.khan | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitconfig.khan b/.gitconfig.khan index 0b6ae52..e1a0bf3 100644 --- a/.gitconfig.khan +++ b/.gitconfig.khan @@ -14,9 +14,9 @@ # Versions of commands that handle submodules properly. # co will also try to convert a git PR to a tag if it can. co = "!f() { if [ -n \"$1\" -a -z \"$2\" ]; then git checkout "`revisionid-to-diffid.sh --tag \"$@\"`"; else git checkout \"$@\"; fi && git submodule update --init --recursive; }; f" - p = "!f() { git pull \"$@\" && git submodule update --init --recursive && if [ -s tools/hook-check.sh ]; then tools/hook-check.sh --fast; fi; }; f" - m = "!f() { git merge \"$@\" && git submodule update --init --recursive && if [ -s tools/hook-check.sh ]; then tools/hook-check.sh --fast; fi; }; f" - gsu = "!f() { git submodule sync --recursive && git submodule update --init --recursive && if [ -s tools/hook-check.sh ]; then tools/hook-check.sh --fast; fi; }; f" + p = "!f() { git pull \"$@\" && git submodule update --init --recursive; }; f" + m = "!f() { git merge \"$@\" && git submodule update --init --recursive; }; f" + gsu = "!f() { git submodule sync --recursive && git submodule update --init --recursive; }; f" # Branch management for dealing with github-style deploys. # e.g. deploy-branch, review-branch, find-reviewers