summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
Commit message (Collapse)AuthorAgeFilesLines
* GIT-VERSION-GEN: mark the version 'dirty' only if there are modified filesJunio C Hamano2008-08-081-0/+1
| | | | | | | | | | | We used to mark the version string with '-dirty' if the cache was not up to date, but the only thing we want to know is if the binaries are built from modified source. Refresh the cache to avoid false dirtyness. Christian Jaeger noticed this issue while building under fakeroot environment (without -u) that lies about the file ownership data. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copyLea Wiemann2008-06-281-1/+1
| | | | | Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.6v1.5.6Junio C Hamano2008-06-181-1/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Teach GIT-VERSION-GEN about the .git fileLars Hjemli2008-04-091-1/+1
| | | | | | | | | | The presence of a .git directory used to be good enough evidence that GIT-VERSION-GEN could use 'git describe' to get a version number. But now .git might as well be a file so the test must be extended to cater for such setups. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.5v1.5.5Junio C Hamano2008-04-071-1/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.5-rc3v1.5.5-rc3Junio C Hamano2008-04-021-1/+1
| | | | | | | | The rate of fixes that trickle in has slowed and we are definitely getting there. Hopefully one final round and we will have the final 1.5.5 soon. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.5-rc2v1.5.5-rc2Junio C Hamano2008-03-271-1/+1
|\ | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * GIT 1.5.4.5v1.5.4.5Junio C Hamano2008-03-271-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * GIT 1.5.4.4v1.5.4.4Junio C Hamano2008-03-081-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | GIT 1.5.5-rc1v1.5.5-rc1Junio C Hamano2008-03-231-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.5.4.3Junio C Hamano2008-02-231-1/+2
|\ \ | |/ | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * GIT 1.5.4.3v1.5.4.3Junio C Hamano2008-02-231-2/+3
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Sync with 1.5.4.2 and start 1.5.5 Release NotesJunio C Hamano2008-02-171-1/+1
|/ | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4.2v1.5.4.2Junio C Hamano2008-02-171-10/+3
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4v1.5.4Junio C Hamano2008-02-011-1/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4-rc5v1.5.4-rc5Junio C Hamano2008-01-261-1/+1
| | | | | | Hopefully the last rc before the final... Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4-rc3v1.5.4-rc3Junio C Hamano2008-01-111-1/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4-rc2v1.5.4-rc2Junio C Hamano2007-12-261-1/+1
| | | | | | | Although everybody was quiet during the Christmas holiday, it's been a week since -rc1, so here is -rc2. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4-rc1v1.5.4-rc1Junio C Hamano2007-12-191-1/+1
| | | | | | | It's been a week since -rc0, and we have quite a lot of fixes, so here it is. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4-rc0v1.5.4-rc0Junio C Hamano2007-12-121-1/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Start 1.5.4 cycleJunio C Hamano2007-09-031-1/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.3.1: obsolete git-p4 in RPM spec file.v1.5.3.1Junio C Hamano2007-09-031-1/+1
| | | | | | | | | | | HPA noticed that yum does not like the newer git RPM set; it turns out that we do not ship git-p4 anymore but existing installations do not realize the package is gone if we do not tell anything about it. David Kastrup suggests using Obsoletes in the spec file of the new RPM to replace the old package, so here is a try. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT v1.5.3-rc1v1.5.3-rc1Junio C Hamano2007-07-121-1/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'maint'Junio C Hamano2007-06-121-0/+2
|\ | | | | | | | | | | * maint: Unquote From line from patch before comparing with given from address. git-cherry: Document 'limit' command-line option
| * GIT 1.5.2.1v1.5.2.1Junio C Hamano2007-06-021-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | War on whitespaceJunio C Hamano2007-06-071-2/+0
|/ | | | | | | | | This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.2v1.5.2Junio C Hamano2007-05-201-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT v1.5.2-rc3v1.5.2-rc3Junio C Hamano2007-05-101-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT v1.5.2-rc2v1.5.2-rc2Junio C Hamano2007-05-061-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT v1.5.2-rc1v1.5.2-rc1Junio C Hamano2007-04-301-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT v1.5.1.3v1.5.1.3Junio C Hamano2007-04-301-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.1.2v1.5.1.2Junio C Hamano2007-04-211-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.1.1v1.5.1.1Junio C Hamano2007-04-111-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.1v1.5.1Junio C Hamano2007-04-031-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.1-rc3v1.5.1-rc3Junio C Hamano2007-03-281-1/+1
|
* GIT 1.5.1-rc2v1.5.1-rc2Junio C Hamano2007-03-251-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.5.1-rc1v1.5.1-rc1Junio C Hamano2007-03-191-1/+1
| | | | | | | | | I think we can start to slow down, as we now have covered everything I listed earlier in the short-term release plan. The last release 1.5.0 took painfully too long. Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT-VERSION-FILE: check ./version first.Junio C Hamano2007-02-141-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>
* GIT 1.5.0v1.5.0Junio C Hamano2007-02-141-1/+1
|
* GIT v1.5.0-rc4v1.5.0-rc4Junio C Hamano2007-02-071-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT v1.5.0-rc3v1.5.0-rc3Junio C Hamano2007-01-311-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT v1.5.0-rc2v1.5.0-rc2Junio C Hamano2007-01-201-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT v1.5.0-rc1v1.5.0-rc1Junio C Hamano2007-01-111-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT v1.5.0 previewv1.5.0-rc0Junio C Hamano2006-12-251-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>
* Merge branch 'maint'Junio C Hamano2006-12-201-1/+1
|\ | | | | | | | | * maint: GIT 1.4.4.3
| * GIT 1.4.4.3v1.4.4.3Junio C Hamano2006-12-201-1/+1
|/ | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.4.4.1v1.4.4.1Junio C Hamano2006-11-221-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.4.4v1.4.4Junio C Hamano2006-11-141-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.4.4-rc2v1.4.4-rc2Junio C Hamano2006-11-111-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.4.3-rc1v1.4.4-rc1Junio C Hamano2006-11-071-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>