summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
AgeCommit message (Collapse)AuthorFilesLines
2007-02-14GIT-VERSION-FILE: check ./version first.Libravatar Junio C Hamano1-10/+11
When somebody else extracts git tarball inside a larger project, 'git describe' would reported the version number of that upper level project. Sometimes, using the consistent versioning across subdirectories of a larger project is useful, but it may not always be the right thing to do. This changes the script to check ./vertion file first, and then fall back to "git describe". This way, by default, tarball distribution will get our own version. If the upper level wants to use consistent versioning across its subdirectories, its Makefile can overwrite ./version file to force whatever version number they want to give us before descending into us. Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-14GIT 1.5.0Libravatar Junio C Hamano1-1/+1
2007-02-07GIT v1.5.0-rc4Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-31GIT v1.5.0-rc3Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-20GIT v1.5.0-rc2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-11GIT v1.5.0-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-12-25GIT v1.5.0 previewLibravatar Junio C Hamano1-1/+1
This is not yet -rc1 where all new topics closes, but I think it is getting pretty closer. I'd still want to merge updates to fsck/prune to honor reflog entries before -rc1. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-12-20Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
* maint: GIT 1.4.4.3
2006-12-20GIT 1.4.4.3Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-22GIT 1.4.4.1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-14GIT 1.4.4Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-11GIT 1.4.4-rc2Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-11-07GIT 1.4.3-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-01GIT 1.4.3-rc1Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-08GIT-VERSION-GEN: adjust for ancient gitLibravatar Junio C Hamano1-1/+9
When an ancient "git" that does not understand "describe" command is on the $PATH, "git describe" emitted a Usage message without exiting non-zero status (which is a mistake we cannot fix retroactively). Catch this case to make sure we do not try using phoney multi-line string as a version number. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-03GIT 1.4.2-rc3Libravatar Junio C Hamano1-1/+1
We ended up merging too many stuff after -rc2, so here is another round of release candidate. Non bugfixes will be queued to "next" from now on until a real 1.4.2 happens. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-10GIT 1.4.0Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-22Change GIT-VERSION-GEN to call git commands with "git" not "git-".Libravatar Sean1-2/+2
GIT-VERSION-GEN can incorrectly return a default version of "v1.3.GIT" because it tries to execute git commands using the "git-cmd" format that expects all git commands to be in the $PATH. Convert these to "git cmd" format so that a proper answer is returned even when the git commands have been moved out of the $PATH and into a $gitexecdir. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-18GIT 1.3.0Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-14GIT v1.3.0-rc4Libravatar Junio C Hamano1-1/+1
I've merged everything I think is ready for 1.3.0, so this is the final round -- hopefully I can release this with minimum last-minute fixup as v1.3.0 early next week. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-07GIT 1.3.0-rc3Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-04GIT 1.3.0-rc2Libravatar Junio C Hamano1-1/+1
Bunch of cleanups with a few notable enhancements since 1.3.0-rc1: - revision traversal infrastructure is updated so that existence of paths limiters and/or --max-age does not cause it to call limit_list(). This helps the latency working with the command quite a bit. - comes with updated gitk. One notable fix is to make sure that the IO is restarted upon signal even on platforms whose default signal semantics is not to do so. This is the fix for the notorious "clone is broken since 1.2.2 on Solaris" problem. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-27GIT 1.3.0 rc1Libravatar Junio C Hamano1-1/+1
All of the things that were not in the "master" branch were either cooked long enough in "next" without causing problems (e.g. insanely fast rename detector or true built-in diff) or isolated in a specific subsystem (e.g. tar-tree and svnimport). So I am clearing the deck to prepare for a 1.3.0. Remaining wrinkles, if any, will be ironed in the "master" branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-03-02GIT-VERSION-GEN: squelch unneeded error from "cat version"Libravatar Junio C Hamano1-1/+4
Now this is really a corner case, but if you have the git source tree from somewhere other than the official tarball, you do not have version file. And if git-describe does not work for you (maybe you do not have git yet), we spilled an error message from "cat version". Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-12GIT 1.2.0Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-26Make GIT-VERSION-GEN tolerate missing git describe command againLibravatar Uwe Zeisberger1-3/+5
Commit 5c7d3c95 broke that by making the git-describe command part of a pipe. Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-16Allow building of RPM from interim snapshot.Libravatar Junio C Hamano1-1/+1
By popular demand. If you build and install such binary RPMs, the version numbering will lose monotonicity, so you may have to later override downgrade warnings from your packaging manager, but as long as you are aware of that and know how to deal with it, there is no reason for us to forbid it. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-09GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.Libravatar Junio C Hamano1-0/+9
If we are building from a working tree with local modifications, mark the version accordingly. Deliberately uses '-' to prevent RPM from being built from such a tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-09For release tarballs, include the proper versionLibravatar H. Peter Anvin1-2/+8
When producing a release tarball, include a "version" file, which GIT-VERSION-GEN can then use to do the right thing when building from a tarball. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05Make GIT-VERSION-GEN tolerate missing git describe commandLibravatar John Ellson1-1/+1
I think it is probably a bug that "git non_existent_command" returns its error message to stdout without an error, where "git-non_existent_command" behaves differently and does return an error. Older versions of git did not implement "git describe" and GIT-VERSION-GEN produces an empty version string if run on a system with such a git installed. The consequence is that "make rpm" fails. This patch fixes GIT-VERSION-GEN so that it works in the absence of a working "git describe" Signed-off-by: John Ellson <ellson@research.att.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27Makefile: use git-describe to mark the git version.Libravatar Junio C Hamano1-0/+18
Note: with this commit, the GIT maintainer workflow must change. GIT-VERSION-GEN is now the file to munge when the default version needs to be changed, not Makefile. The tag needs to be pushed into the repository to build the official tarball and binary package beforehand. Signed-off-by: Junio C Hamano <junkio@cox.net>