1
0
mirror of https://github.com/git/git.git synced 2024-11-18 21:43:58 +01:00
Commit Graph

83 Commits

Author SHA1 Message Date
Junio C Hamano
2414721b19 Merge fixes up to GIT 1.0.4 2005-12-24 00:16:56 -08:00
Junio C Hamano
6ab58895cd GIT 1.0.4
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-24 00:02:08 -08:00
Junio C Hamano
c10d634518 Merge in fixes up to 1.0.3 maintenance branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-22 18:19:03 -08:00
Junio C Hamano
c63da8d8e8 GIT 1.0.3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-22 18:14:31 -08:00
Junio C Hamano
c894168631 Versioning scheme changes.
HPA suggests it is simply silly to imitate Linux versioning
scheme where the leading "2" does not mean anything anymore, and
I tend to agree.

The first feature release after 1.0.0 will be 1.1.0, and the
development path leading to 1.1.0 will carry 1.0.GIT as the
version number from now on.  Similarly, the third maintenance
release that follows 1.0.0 will not be 1.0.0c as planned, but
will be called 1.0.3.  The "maint" branch will merge in fixes
and immediately tagged, so there is no need for 1.0.2.GIT that
is in between 1.0.2 (aka 1.0.0b) and 1.0.3.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-21 22:33:37 -08:00
Junio C Hamano
8d712aafd2 GIT 1.0.0b
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-21 13:51:51 -08:00
Junio C Hamano
e4e79a2175 GIT 1.0.0a
- Avoid misleading success message on error (Johannes)
    - objects/info/packs: work around bug in http-fetch.c::fetch_indices()
    - http-fetch.c: fix objects/info/pack parsing.
    - An off-by-one bug found by valgrind (Pavel)

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-21 13:17:54 -08:00
Junio C Hamano
5d9d11db3c Post 1.0.0 development track.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-21 12:12:26 -08:00
Junio C Hamano
c2f3bf071e GIT 1.0.0
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-21 00:01:00 -08:00
Junio C Hamano
1ed91937e5 GIT 0.99.9n aka 1.0rc6
Oh, I hate to do this but I ended up merging big usage string
cleanups from Fredrik, git-am enhancements that made a lot of
sense for non mbox users from HPA, and rebase changes (done
independently by me and Lukas) among other things, so git is
still in perpetual state of 1.0rc.  1.0 will probably be next
Wednesday, but who knows.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-14 17:30:03 -08:00
Junio C Hamano
a9572072f0 GIT 0.99.9m aka 1.0rc5
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-11 16:49:45 -08:00
Junio C Hamano
423325a2d2 GIT 0.99.9l aka 1.0rc4 2005-12-03 23:46:02 -08:00
Junio C Hamano
93dcab2937 GIT 0.99.9k
This is not 1.0rc4 yet, but to push the recent fixes out.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-25 16:35:20 -08:00
Junio C Hamano
27dedf0c3b GIT 0.99.9j aka 1.0rc3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-16 21:32:44 -08:00
Junio C Hamano
60d64db461 GIT 0.99.9i aka 1.0rc2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-14 18:39:18 -08:00
Junio C Hamano
b6ebac9e43 Merge branch 'svnup' of http://netz.smurf.noris.de/git/git
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-14 13:50:05 -08:00
Matthias Urlichs
0f3f5e3f69 Depend on asciidoc 7 (at least). 2005-11-14 17:41:31 +01:00
Junio C Hamano
6d5410d651 Merge branch 'svnup' of http://netz.smurf.noris.de/git/git 2005-11-14 00:25:48 -08:00
Junio C Hamano
ac0b86dadf Debian: build-depend on libexpat-dev.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-13 01:57:33 -08:00
Matthias Urlichs
ceae78b438 debian packaging: git-cvs needs cvsps 2005-11-12 23:15:50 +01:00
Junio C Hamano
f7a2eb7359 GIT 0.99.9h
This is GIT 1.0-rc1 in disguise.  It is plausible that
relatively new parts of the system still need tweaking and
fixing, but that is why it is not 1.0 but rc ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-11 22:37:38 -08:00
Junio C Hamano
23ea3e201c GIT 0.99.9g
Another snapshot, as slow and steady marth towards 1.0 continues.
Major changes include:

 - Jim Radford's RPM split.
 - Fredrik's recursive merge strategy is now default for two heads merge.
 - Yaacov's SVN importer updates.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-09 21:09:43 -08:00
Junio C Hamano
5ca15b8af7 GIT 0.99.9f
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08 01:25:59 -08:00
Junio C Hamano
76bca9d1a9 Debian: packaging updates.
Do not scatter txt and html documentation into feature subpackages.
Do place man pages into them.

Capture more cvs stuff into git-cvs package.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08 01:20:24 -08:00
Junio C Hamano
72e5890b68 GIT 0.99.9e
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-06 18:57:40 -08:00
Junio C Hamano
c0a2ed1b49 Debian: test build.
Update version number in changelog to match the 0.99.9.GIT version
number, to allow building private deb from wip.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-06 01:12:33 -08:00
Junio C Hamano
9eba845f20 Further Debian split fixes.
The doc installation was flattened, breaking links to howto/.
Silly cut&paste error made git-doc depend on tk8.4.  Doh.
Move most of the documentation (except manuals) to git-doc.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-06 01:12:32 -08:00
Junio C Hamano
d071e8dbb6 Package split: Debian.
As discussed on the list, split the foreign SCM interoperability
packages and documentation from the git-core binary package.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-06 01:12:31 -08:00
Junio C Hamano
87ce294c91 GIT 0.99.9d
This is primarily to include the 'git clone -l' (without -s) fix,
first spotted and diagnosed by Linus and caused James Bottomley's
repository to become unreadable.  It also contains documentation
updates happened on the "master" branch since 0.99.9c

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-05 11:50:24 -08:00
Junio C Hamano
6ddc096403 GIT 0.99.9c
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-03 15:45:36 -08:00
Junio C Hamano
235d521da6 GIT 0.99.9b
This contains the changes made on the master branch since 0.99.9a.

The workaround for building RPMs has not changed since 0.99.9a,
mainly because I haven't heard back if it was good enough for
kernel.org consumption, or otherwise what changes are needed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-01 21:58:53 -08:00
Junio C Hamano
e634aec752 GIT 0.99.9a
... to contain the RPM workaround.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-30 18:06:39 -08:00
Junio C Hamano
46774a81f9 GIT 0.99.9
Done in 0.99.9
==============

Ports
~~~~~

* Cygwin port [HPA].

* OpenBSD build [Merlyn and others].

Fixes
~~~~~

* clone request over git native protocol from a repository with
  too many refs did not work; this has been fixed.

* git-daemon got safer for kernel.org use [HPA].

* Extended SHA1 parser was not enforcing uniqueness for
  abbreviated SHA1; this has been fixed.

* http transport does not barf on funny characters in URL.

* The ref naming restrictions have been formalized and the
  coreish refuses to create funny refs; we still need to audit
  importers.  See git-check-ref-format(1).

New Features and Commands
~~~~~~~~~~~~~~~~~~~~~~~~~

* .git/config file as a per-repository configuration mechanism,
  and some commands understand it [Linus].  See
  git(7).

* The core.filemode configuration item can be used to make us a
  bit more FAT friendly.  See git(7).

* The extended SHA1 notation acquired Peel-the-onion operator
  ^{type} and ^{}.  See git-rev-parse(1).

* SVN importer [Matthias].  See git-svnimport(1).

* .git/objects/[0-9a-f]{2} directories are created on demand,
  and removed when becomes empty after prune-packed [Linus].

* Filenames output from various commands without -z option are
  quoted when they embed funny characters (TAB and LF) using
  C-style quoting within double-quotes, to match the proposed
  GNU diff/patch notation [me, but many people contributed in
  the discussion].

* git-mv is expected to be a better replacement for git-rename.
  While the latter has two parameter restriction, it acts more
  like the regular 'mv' that can move multiple things to one
  destinatino directory [Josef Weidendorfer].

* git-checkout can take filenames to revert the changes to
  them.  See git-checkout(1)

* The new program git-am is a replacement for git-applymbox that
  has saner command line options and a bit easier to use when a
  patch does not apply cleanly.

* git-ls-remote can show unwrapped onions using ^{} notation, to
  help Cogito to track tags.

* git-merge-recursive backend can merge unrelated projects.

* git-clone over native transport leaves the result packed.

* git-http-fetch issues multiple requests in parallel when
  underlying cURL library supports it [Nick and Daniel].

* git-fetch-pack and git-upload-pack try harder to figure out
  better common commits [Johannes].

* git-read-tree -u removes a directory when it makes it empty.

* git-diff-* records abbreviated SHA1 names of original and
  resulting blob; this sometimes helps to apply otherwise an
  unapplicable patch by falling back to 3-way merge.

* git-format-patch now takes series of from..to rev ranges and
  with '-m --stdout', writes them out to the standard output.
  This can be piped to 'git-am' to implement cheaper
  cherry-picking.

* git-tag takes '-u' to specify the tag signer identity [Linus].

* git-rev-list can take optional pathspecs to skip commits that
  do not touch them (--dense) [Linus].

* Comes with new and improved gitk [Paulus and Linus].

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-29 14:35:11 -07:00
Junio C Hamano
a1c7a69047 GIT 0.99.8g
Primarily to update the maintenance branch deployed on kernel.org
machines with the git-daemon updates.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-23 02:04:01 -07:00
Junio C Hamano
c9ed27b9e8 GIT 0.99.8f
Yes I said 0.99.8e was the last maintenance release for 0.99.8, but it
turns out that there was another backport necessary after git-daemon
was unleashed on kernel.org servers.

Contains the following since 0.99.8e:

H. Peter Anvin:
      revised^2: git-daemon extra paranoia, and path DWIM

Johannes Schindelin:
      Fix cvsimport warning when called without --no-cvs-direct

Junio C Hamano:
      Do not ask for objects known to be complete.

Linus Torvalds:
      git-fetch-pack: avoid unnecessary zero packing
      Optimize common case of git-rev-list

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-19 02:31:27 -07:00
Junio C Hamano
c99ec048bf GIT 0.99.8e
Linus Torvalds:
      make checkout-index '-a' flag saner.

Junio C Hamano:
      whatchanged: document -m option from git-diff-tree.
      Functions to quote and unquote pathnames in C-style.
      Update git-apply to use C-style quoting for funny pathnames.
      Do not quote SP.
      git-checkout-index: documentation updates.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-17 21:52:10 -07:00
Junio C Hamano
a34484e1c9 We do not depend on patch.
Deb packaging claim we depend on patch, but I think we use git-apply
where it matters.  When a patch does not apply with git-apply, using
GNU patch still is helpful sometimes.  So demote it from "Depends" to
"Suggests".

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-16 12:01:28 -07:00
Junio C Hamano
29504118f8 Merge branch 'svn' of http://netz.smurf.noris.de/git/git
[jc: I have my pre-commit hook enabled to catch trailing whitespaces,
 and fixed them up while merging.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-16 11:55:35 -07:00
Junio C Hamano
a2239b79e5 GIT v0.99.8d
Contains the following changes since v0.99.8c.

Johannes Schindelin:
      Teach git-status about spaces in file names also on MacOSX
      t5400-send-pack relies on a working cpio

Jonas Fonseca:
      git.sh: quote all paths

Junio C Hamano:
      Also force LC_ALL in test scripts.
      OpenBSD needs the strcasestr replacement.
      git-check-ref-format: reject funny ref names.
      Refuse to create funny refs in clone-pack, git-fetch and receive-pack.
      Ignore funny refname sent from remote
      Introduce notation "ref^{type}".

Martin Langhoff:
      cvsimport: don't pass --cvs-direct if user options contradict us

Ralf Baechle:
      rsh.c: typo fix

Note that "funny ref" bits are not strictly fixes but rather
backport from the "master" branch.  They will prevent refs and
heads with funny names from being created.  In addition, what is
in the master branch will start feeding the clients unwrapped
tag information to help Martin's findtags and possibly later
Cogito.  These backported "funny ref" changes are to prevent
clients on the "maint" branch from getting confused when talking
with newer git-upload-pack and when reading from info/refs file
prepared with newer git-update-server-info.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-15 18:10:02 -07:00
Aneesh Kumar
e70ec8632c debian packaging
Make it build with stable testing and unstable.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-14 17:15:11 -07:00
Matthias Urlichs
c6582aba52 svn import: add libsvn-core-perl to Debian's control file
Added libsvn-core-perl to debian/control, "Recommends:" section.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
2005-10-10 13:10:01 +02:00
Junio C Hamano
32e49d5d1c GIT 0.99.8c
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-09 19:19:36 -07:00
Junio C Hamano
8b1f8d04c9 GIT 0.99.8b
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05 15:41:49 -07:00
Junio C Hamano
e1d04f8aad GIT 0.99.8a
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03 16:27:46 -07:00
Junio C Hamano
91dd674e30 GIT 0.99.8
GIT already did everything I wanted it to do since mid 0.99.7,
and it has almost everything I want it to have now, except a
couple of minor tweaks and enhancements.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02 16:07:29 -07:00
Junio C Hamano
d5bc7eecbb GIT v0.99.7d
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-25 00:41:15 -07:00
Junio C Hamano
00d8bbd3c4 GIT 0.99.7c
Contains the following post-0.99.7b fixes:

 - rsh.c string termination fix by H. Peter Anvin
 - further fetch fixes by Sergey Vlasov
 - diff-tree documentation by Robert Watson.
 - 'git diff --cached' synonymous to 'git diff --cached HEAD'.
 - subprocess.py licensing status clarification.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-24 11:38:43 -07:00
Junio C Hamano
990f856a62 GIT 0.99.7b
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-22 21:53:33 -07:00
Junio C Hamano
dc4393cba3 GIT 0.99.7a
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-19 19:50:09 -07:00
Junio C Hamano
8ac93bc98f Merge branch 'master' of . 2005-09-18 01:18:15 -07:00