split pbs-package-commit into pbs-package-{post,}commit, and fix it

1 files changed, 35 insertions, 0 deletions

diff --git a/pbs-package-postcommit b/pbs-package-postcommit
new file mode 100755
index 0000000..e8ff196
--- /dev/null
+++ b/pbs-package-postcommit
@@ -0,0 +1,35 @@
+#!/bin/bash -euE
+
+. pbs-plumb-shlib
+
+cmd=${0##*/}
+usage() {
+	echo "Usage: $cmd [git-commit OPTIONS]"
+	echo 'Call this after doing a `git commit` manually.'
+	echo ''
+	echo 'This cascades the commit up out of the submodule.'
+	echo ''
+	echo 'Options:'
+	echo '  -h            Show this message'
+}
+
+main() {
+	if in_array '-h' "$@"; then
+		usage
+		return 0
+	fi
+
+	ensure_in_pbs-package
+
+	# push the commit upstream
+	git push -f origin "$(gitbranch)"
+
+	# update the submodule
+	local msg="$(git log -n1 --pretty=format:%B)"
+	local dir="$(pwd)"
+	cdto_pbs-root
+	git add "$dir"
+	git commit -m "$msg"
+}
+
+main "$@"