]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Dothem: further avoid testing the same tree twice
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:29:04 +0000 (23:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 07:29:04 +0000 (23:29 -0800)
Dothem

diff --git a/Dothem b/Dothem
index 3e16e4ab65098806a846d6e1569b557c789fc705..1ba205e1c17c11cf7a1db6f507d41c57f7409bc1 100755 (executable)
--- a/Dothem
+++ b/Dothem
@@ -125,14 +125,14 @@ do
        version=$(find_installed $branch)
        if      test "z$version" = "z$revision"
        then
-               echo "* up-to-date version \"$installed\" is already installed from $branch"
+               echo "* up-to-date version is already installed from $branch"
                test -n "$force" || continue
        fi
 
+       vtree=$(git rev-parse --verify "$version^{tree}")
+       rtree=$(git rev-parse --verify "$revision^{tree}")
        (
                skip_test=$notest
-               vtree=$(git rev-parse --verify "$version^{tree}")
-               rtree=$(git rev-parse --verify "$revision^{tree}")
                case "$installed_source_trees" in
                *" $rtree "*)
                        skip_test=1
@@ -143,6 +143,12 @@ do
                        skip_test=1
                        nodoc=1
                fi
+               dvtree=$(git rev-parse --verify "$version:Documentation/")
+               drtree=$(git rev-parse --verify "$revision:Documentation/")
+               if test "z$dvtree" = "z$drtree"
+               then
+                       nodoc=1
+               fi
                case "$branch, $branches " in
                jch,*' next '*)
                        if git diff --quiet --exit-code jch next
@@ -214,4 +220,5 @@ do
                git reset --hard
        ) </dev/null || exit $?
 
+       installed_source_trees="$installed_source_trees$rtree "
 done