You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/12/22 02:08:15 UTC
accumulo-website git commit: ACCUMULO-4540 Update err msg in
post-commit hook
Repository: accumulo-website
Updated Branches:
refs/heads/master e0a6f172a -> cb209b3ec
ACCUMULO-4540 Update err msg in post-commit hook
Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/cb209b3e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/cb209b3e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/cb209b3e
Branch: refs/heads/master
Commit: cb209b3ec9f02a001bd64b6769f335a58bc859b3
Parents: e0a6f17
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Dec 21 21:05:33 2016 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Dec 21 21:05:33 2016 -0500
----------------------------------------------------------------------
_devtools/git-hooks/post-commit | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/cb209b3e/_devtools/git-hooks/post-commit
----------------------------------------------------------------------
diff --git a/_devtools/git-hooks/post-commit b/_devtools/git-hooks/post-commit
index 408cde8..127eb44 100755
--- a/_devtools/git-hooks/post-commit
+++ b/_devtools/git-hooks/post-commit
@@ -18,13 +18,14 @@ build_jekyll_site() {
. "$(git --exec-path)/git-sh-setup" || return 1
# ensure target branch exists
- local target_branch; target_branch=$(git rev-parse --symbolic-full-name "$tgt_br" 2>/dev/null) || die "fatal: $tgt_br is not a branch"
+ local not_a_branch_msg; not_a_branch_msg="$tgt_br is not a branch; this script can only update branches named $tgt_br (try: git checkout -t origin/$tgt_br)"
+ local target_branch; target_branch=$(git rev-parse --symbolic-full-name "$tgt_br" 2>/dev/null) || die "fatal: $not_a_branch_msg"
case "$target_branch" in
refs/heads/*)
true
;;
*)
- die "fatal: $tgt_br is not a branch"
+ die "fatal: $not_a_branch_msg"
;;
esac