Meta/Dothem: further avoid testing the same tree twice
Junio C Hamano committed
Feb 26, 2012 at 23:29 UTC
14b270036babc4a3f9e18355e286d25fe357a8b7
1 file changed
+10
-3
Dothem
+10
-3
@@ -125,14 +125,14 @@ do
125
version=$(find_installed $branch)
126
if test "z$version" = "z$revision"
127
then
128
- echo "* up-to-date version \"$installed\" is already installed from $branch"
128
+ echo "* up-to-date version is already installed from $branch"
129
test -n "$force" || continue
130
fi
131
132
+ vtree=$(git rev-parse --verify "$version^{tree}")
133
+ rtree=$(git rev-parse --verify "$revision^{tree}")
134
(
135
skip_test=$notest
134
- vtree=$(git rev-parse --verify "$version^{tree}")
135
- rtree=$(git rev-parse --verify "$revision^{tree}")
136
case "$installed_source_trees" in
137
*" $rtree "*)
138
skip_test=1
@@ -143,6 +143,12 @@ do
143
skip_test=1
144
nodoc=1
145
fi
146
+ dvtree=$(git rev-parse --verify "$version:Documentation/")
147
+ drtree=$(git rev-parse --verify "$revision:Documentation/")
148
+ if test "z$dvtree" = "z$drtree"
149
+ then
150
+ nodoc=1
151
+ fi
152
case "$branch, $branches " in
153
jch,*' next '*)
154
if git diff --quiet --exit-code jch next
@@ -214,4 +220,5 @@ do
220
git reset --hard
221
) </dev/null || exit $?
222
223
+ installed_source_trees="$installed_source_trees$rtree "
224
done