Merge pull request #12088 from dt/hooks

githooks: just update submodule on ref changes
cockroachdb · Dec 6, 2016 · b4de2e6 · b4de2e6
2 parents 2953392 + 3f06d9b
commit b4de2e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/githooks/post-checkout b/githooks/post-checkout
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-[[ ! $GIT_REFLOG_ACTION =~ pull[[:space:]]+--rebase ]] && exit 0
-
-make .bootstrap
+if [ "$1" != "$2" ]; then # previous ref != new ref.
+  exec git submodule update --init
+fi
diff --git a/githooks/post-merge b/githooks/post-merge
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 set -e
 
-[[ ! $GIT_REFLOG_ACTION =~ pull ]] && exit 0
-
-make .bootstrap
+exec git submodule update --init
diff --git a/githooks/post-rewrite b/githooks/post-rewrite
@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 set -e
 
-[[ ! $GIT_REFLOG_ACTION =~ rebase ]] && exit 0
-
-make .bootstrap
+# TODO(dt): do we want to submomdule update here?