Browse Source

Meta/V & Meta/Doit: adjust to exact release

"git version" would not have g suffix for an exact release.
todo
Junio C Hamano 18 years ago
parent
commit
15ef670d68
  1. 22
      Doit
  2. 6
      V

22
Doit

@ -1,7 +1,12 @@
#!/bin/sh #!/bin/sh


: ${J=-j2} : ${J=-j2}
while case "$1" in -pedantic) M=$1 ;; *) break ;; esac force=
while case "$1" in
-pedantic) M=$1 ;;
-force) force=$1 ;;
*) break ;;
esac
do do
shift shift
done done
@ -17,18 +22,23 @@ Meta/Make clean >/dev/null 2>&1
nstall=install nstall=install
for branch in $branches for branch in $branches
do do
echo >&3 "** $branch **"

revision=$(git show-ref -s --verify "refs/heads/$branch") || { revision=$(git show-ref -s --verify "refs/heads/$branch") || {
echo "** No $branch" echo "** No $branch"
continue continue
} }


if installed=$($HOME/git-$branch/bin/git version) && if installed=$($HOME/git-$v/bin/git version) &&
version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') && {
version=$(git rev-parse --verify "$version") && version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
version=v$(expr "$installed" : 'git version \(.*\)')
} &&
version=$(git rev-parse --verify "$version^0") &&
test "z$version" = "z$revision" test "z$version" = "z$revision"
then then
echo "* up-to-date version \"$installed\" is already installed from $branch" echo "* up-to-date version \"$installed\" is already installed from $branch"
continue test -n "$force" || continue
fi fi


echo "** $branch" && echo "** $branch" &&
@ -38,7 +48,7 @@ do
Meta/Make $M -- test && Meta/Make $M -- test &&
Meta/Make clean || exit $? Meta/Make clean || exit $?


done >./:all.log 2>&1 done >./:all.log 3>&2 2>&1


git checkout master git checkout master



6
V

@ -3,8 +3,10 @@
for v in maint master next pu for v in maint master next pu
do do
installed=$($HOME/git-$v/bin/git version) installed=$($HOME/git-$v/bin/git version)
version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$') ||
version=$(git rev-parse --verify "$version") version=v$(expr "$installed" : 'git version \(.*\)')

version=$(git rev-parse --verify "$version^0")
revision=$(git show-ref -s --verify "refs/heads/$v") revision=$(git show-ref -s --verify "refs/heads/$v")
if test "z$version" = "z$revision" if test "z$version" = "z$revision"
then then

Loading…
Cancel
Save