]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Dothem: simplify rule to avoid running tests
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Feb 2014 23:34:28 +0000 (15:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Feb 2014 23:34:28 +0000 (15:34 -0800)
Dothem

diff --git a/Dothem b/Dothem
index c98e8bff4db16c2a91d78cc5415fb6edfa5cc614..7f18d86a40f035c9c73fc978ce80b4a00fad4ba6 100755 (executable)
--- a/Dothem
+++ b/Dothem
@@ -139,20 +139,17 @@ do
                ?*)
                        ;;
                '')
-                       case "$installed_source_trees" in
-                       *" $rtree "*)
-                               skip_test=1
-                               ;;
-                       esac
-                       if test "z$vtree" = "z$rtree"
-                       then
-                               skip_test=1
-                               skip_doc=1
-                       elif git diff --quiet "$vtree" "$rtree" -- . \
-                           ':!GIT-VERSION-GEN' ':!Documentation/'
-                       then
-                               skip_test=1
-                       fi
+                       for xtree in $installed_source_trees $vtree
+                       do
+                               if test "z$xtree" = "z$rtree" ||
+                                       git diff --quiet "$xtree" "$rtree" -- . \
+                                       ':!GIT-VERSION-GEN' ':!Documentation/'
+                               then
+                                       skip_test=1
+                                       break
+                               fi
+                       done
+
                        dvtree=$(git rev-parse --verify "$version:Documentation/")
                        drtree=$(git rev-parse --verify "$revision:Documentation/")
                        if test "z$dvtree" = "z$drtree"