ceph-docs/build/build: don't try to skip if not a merge commit

This touches on http://tracker.ceph.com/issues/19976, but doesn't
fix it; it just defaults to "build it if it's not a merge commit".
I'm still not sure the ideas in the bug are workable.  So this
mitigates the issue.

Signed-off-by: Dan Mick <dan.mick@redhat.com>

diff --git a/ceph-docs/build/build b/ceph-docs/build/build
index 01a72095ac8c6f528e69651f02944192ebf3f11f..633ac68f685eabbd06156917242c9d8ceb2a4187 100644 (file)
--- a/ceph-docs/build/build
+++ b/ceph-docs/build/build
@@ -1,21 +1,26 @@
 #!/bin/bash
+# vim: ts=4 sw=4 expandtab
 
 set -ex
 
 # did any doc/ files change?  
-# This assumes $GIT_COMMIT is a merge commit (it is usually, because that's how
-# we manage ceph, with PRs that include merges).  So, noting the three dots,
+# If $GIT_COMMIT is a merge commit (it is usually, because that's how
+# we manage ceph, with PRs that include merges):  noting the three dots,
 # this git diff invocation compares the common ancestor between first parent
 # (original state of the branch) to the second parent (the branch being merged
 # in) i.e., same as git diff $(git merge-base p1 p2) p2 and outputs filenames
-# only (--name-only)
-
-# enclosing doublequotes prevent newlines from disappearing, for grep below
-files="$(git diff --name-only ${GIT_COMMIT}^1...${GIT_COMMIT}^2)"
-echo -e "changed files:\n$files"
-if ! (echo "$files" | grep -sq '^doc/'); then
-       echo "No doc files changed, skipping build"
-       exit 0
+# only (--name-only).
+#
+# Skip this optimization for non-merge commits
+
+if git rev-parse --verify ${GIT_COMMIT}^2; then
+    # enclosing doublequotes prevent newlines from disappearing, for grep below
+    files="$(git diff --name-only ${GIT_COMMIT}^1...${GIT_COMMIT}^2)"
+    echo -e "changed files:\n$files"
+    if ! (echo "$files" | grep -sq '^doc/'); then
+        echo "No doc files changed, skipping build"
+        exit 0
+    fi
 fi
 
 ./admin/build-doc