On Sun, Nov 27, 2011 at 7:55 PM, Randall Leeds <[email protected]> wrote: > On Sun, Nov 27, 2011 at 16:51, Paul Davis <[email protected]> wrote: >> On Sun, Nov 27, 2011 at 6:14 PM, Randall Leeds <[email protected]> >> wrote: >>> On Sun, Nov 27, 2011 at 14:44, Paul Davis <[email protected]> >>> wrote: >>>> Did you check here that this actually works? We have weird issues with >>>> our branches being migrated from SVN. >>> > > Yeah. 1.1.x is the only branch where this works currently because it's > the only one with a tag that git can actually resolve. > For example, right now I get 1.1.1-16-g3108a12 on the 1.1.x branch. >
Ack. We could theoretically fix the other tags if people cared, but I'm not inclined to muck with history for such a cosmetic fix that'll just work in the future. >>> Yeah. Worked for me on master and all the release branches. >>> The --always ensures that it falls back to the same short hash we had >>> before when it can't find a tag. >>> >> >> Did you get it to ever not fall back to the sha though? I think the >> issue is that our release branch tips are not descendants of the tags? >> I only know there was weirdness here but never dug far enough to grok >> the whole thing. >> >>>> >>>> On Sat, Nov 26, 2011 at 11:34 PM, <[email protected]> wrote: >>>>> Updated Branches: >>>>> refs/heads/master 88e3d1a51 -> 0706a84b8 >>>>> >>>>> >>>>> use git-describe in bootstrap >>>>> >>>>> ``git describe --always`` is superior to ``git log`` in this case. It >>>>> generates a more useful version tag. For example, it allows a developer >>>>> building packages from the source tree to track and package unreleased >>>>> changes in a way that makes sense to package managers. >>>>> >>>>> Using the --always flag reverts to the old behavior when no git tag is >>>>> resolvable from the current HEAD. >>>>> >>>>> >>>>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo >>>>> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0706a84b >>>>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0706a84b >>>>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0706a84b >>>>> >>>>> Branch: refs/heads/master >>>>> Commit: 0706a84b84a2ca094c749af59642ae06bd0f6830 >>>>> Parents: 88e3d1a >>>>> Author: Randall Leeds <[email protected]> >>>>> Authored: Sat Nov 26 21:30:54 2011 -0800 >>>>> Committer: Randall Leeds <[email protected]> >>>>> Committed: Sat Nov 26 21:30:54 2011 -0800 >>>>> >>>>> ---------------------------------------------------------------------- >>>>> bootstrap | 2 +- >>>>> 1 files changed, 1 insertions(+), 1 deletions(-) >>>>> ---------------------------------------------------------------------- >>>>> >>>>> >>>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/0706a84b/bootstrap >>>>> ---------------------------------------------------------------------- >>>>> diff --git a/bootstrap b/bootstrap >>>>> index 1190280..4af3936 100755 >>>>> --- a/bootstrap >>>>> +++ b/bootstrap >>>>> @@ -33,7 +33,7 @@ mkdir -p build-aux >>>>> >>>>> if test -z "$REVISION"; then >>>>> if test -d .git; then >>>>> - REVISION=`git log --pretty="format:%h" | head -1`-git >>>>> + REVISION=`git describe --always`-git >>>>> else >>>>> # default to svn >>>>> REVISION=`\`which svn\` info . 2> /dev/null | awk >>>>> "/Revision:/{print \\$2}"` >>>>> >>>>> >>>> >>> >> >
