Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

[ANNOUNCE] GIT 0.99.7

4 views
Skip to first unread message

Junio C Hamano

unread,
Sep 18, 2005, 7:40:08 PM9/18/05
to
I am hoping that sending this out to the kernel list is not
considered too much of useless spamming, but I promise I
wouldn't do thit next time for 0.99.8, if I hear from somebody
not to.

Here comes GIT 0.99.7

--

Done in 0.99.7
==============

Organization
~~~~~~~~~~~~

Some commands and most scripts are renamed for consistency.

- We have an official standard terminology list [*1*]. To
match this, commands that operate on index files now have
'index' instead of 'cache' in their names, and ones that
download are called 'fetch' instead of 'pull'.

- We used to install most of the commands that happen to be
implemented as scripts as 'git-*-script', which was
cumbersome to remember and type unless you always used 'git'
wrapper. They lost '-script' suffix from their names.

For now, we install synonyms as symbolic links so that old
names continue to work, but they are planned to be removed in
0.99.8 (or later if there are enough objections on the list --
so far I have heard none).

Also ancient environment variables [*2*] are not supported
anymore.


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

Downloaders that are not fully git aware have been taught about
the mechanism to borrow objects from other repositories via
objects/info/alternates the server side may be using. 'git
fetch' and 'git pull' commands over rsync and http transport
should be able to handle such repositories [*3*].

People found interesting cases where the 'stupid' three-way
merge mechanism does the wrong thing without noticing. We have
two new merge algorithms by Daniel and Fredrik that attempt to
do better in such cases. A new 'git merge' command has been
introduced to make it easier to experiment with and choose among
different merge strategies. Note that 'git pull' still uses the
traditional three-way merge after downloading, but it is
expected to be switched to use 'git merge' sometime in the
future.

Importing from tla archives has been improved and documentated.

'git branch' command acquired '-d' flag to delete a branch that
has already been merged into the current branch.

'git bisect' command is easier to use by logging the earlier
good/bad choices and make it replayable.

'git repack' has -a' flag to pack the whole repository into a
single pack.

'git grep' is a new command to run grep on files 'git' knows
about.


Fixes
~~~~~

* 'git-diff-*' commands used to mark copy/rename incorrectly
when an (A,B) => (B,C) rename was made. We said the new B is
a copy of old A, not a rename of old A.

* When the user exported CDPATH into environment, 'cd' took
scripts to unexpected places. Unset it upfront to guard us.

* 'git format-patch' knows about 'git cherry' and skips patches
already merged upstream.

* hopefully plugged memory leak in diffcore-rename properly.

* commit walkers incorrectly assumed having a commit means we
have the whole history leading up to it -- which is not true
if the previous download was interrupted. As a safety
measure, we now only trust the commits that are pointed by the
existing refs.

* 'git rev-list' uses a lot less memory.

* The build should be a bit friendlier to Solaris and Darwin now.

* 'git ssh-{push,pull}' are friendlier to tcsh.

* http transport is nicer to caching proxies.

* 'git daemon' port is registered with IANA.

* Many documentation updates.


[Footnotes]
*1* http://www.kernel.org/pub/software/scm/git/docs/glossary.html

*2* Ancient environment variable names: SHA1_FILE_DIRECTORIES
AUTHOR_DATE AUTHOR_EMAIL AUTHOR_NAME COMMIT_AUTHOR_EMAIL
COMMIT_AUTHOR_NAME SHA1_FILE_DIRECTORY

*3* But not grafts.


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Petr Baudis

unread,
Sep 18, 2005, 9:20:08 PM9/18/05
to
Hello,

this is the release of Cogito-0.15. It fixes several minor bugs, and
adds a feature or two. The most important thing though is that this
depends on Git-core-0.99.7 and uses the new command names. Everyone is
encouraged to upgrade at least to this Cogito version in the next few
days, since the older Cogito versions likely won't work with the future
Git-core releases.

To stay in sync with the Git terminology, Cogito also renames its
cg-pull to cg-fetch. Since this is a major naming change (I'm not too
happy about it, personally), cg-pull will stay aliased to cg-fetch for
at least one (likely two) next major Cogito releases (it also produces a
warning when invoked as cg-pull). In the more distant future, cg-pull
will slowly become the new name of cg-update, to make it confusing.

While at it, we also renamed the *-id scriptlets to cg-*-id. Other
notable stuff is cg-init respecting the ignore rules, and better UI for
cg-add wrt. directories (including cg-add -r support).

Now let's see what the usual bug-right-after-release (major release,
so a major bug?) will be this time.

Happy hacking,

--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone. -- Alan Cox

Nigel Cunningham

unread,
Sep 18, 2005, 10:30:11 PM9/18/05
to
Hi.

On Mon, 2005-09-19 at 09:37, Junio C Hamano wrote:
> I am hoping that sending this out to the kernel list is not
> considered too much of useless spamming, but I promise I
> wouldn't do thit next time for 0.99.8, if I hear from somebody
> not to.
>
> Here comes GIT 0.99.7

Could you please include a url for anyone who might not know the
canonical address from which to download?

Regards,

Nigel

Chris White

unread,
Sep 18, 2005, 11:40:06 PM9/18/05
to
On Monday 19 September 2005 11:24, Nigel Cunningham wrote:

> Could you please include a url for anyone who might not know the
> canonical address from which to download?

http://www.kernel.org/pub/software/scm/git/

> Regards,

> Nigel

Chris White

Pavel Machek

unread,
Sep 19, 2005, 7:20:10 PM9/19/05
to
Hi!

> this is the release of Cogito-0.15. It fixes several minor bugs, and
> adds a feature or two. The most important thing though is that this
> depends on Git-core-0.99.7 and uses the new command names. Everyone is
> encouraged to upgrade at least to this Cogito version in the next few
> days, since the older Cogito versions likely won't work with the future
> Git-core releases.
>
> To stay in sync with the Git terminology, Cogito also renames its
> cg-pull to cg-fetch. Since this is a major naming change (I'm not too
> happy about it, personally), cg-pull will stay aliased to cg-fetch for
> at least one (likely two) next major Cogito releases (it also produces a
> warning when invoked as cg-pull). In the more distant future, cg-pull
> will slowly become the new name of cg-update, to make it confusing.

Could we keep at least the cg-update name? It is certainly not a
*pull* because it does update local repository (and tree, too).

Pavel
--
if you have sharp zaurus hardware you don't need... you know my address

Petr Baudis

unread,
Sep 19, 2005, 8:40:05 PM9/19/05
to
Dear diary, on Tue, Sep 20, 2005 at 01:15:38AM CEST, I got a letter
where Pavel Machek <pa...@suse.cz> told me that...
> Hi!

Hi,

> > this is the release of Cogito-0.15. It fixes several minor bugs, and
> > adds a feature or two. The most important thing though is that this
> > depends on Git-core-0.99.7 and uses the new command names. Everyone is
> > encouraged to upgrade at least to this Cogito version in the next few
> > days, since the older Cogito versions likely won't work with the future
> > Git-core releases.
> >
> > To stay in sync with the Git terminology, Cogito also renames its
> > cg-pull to cg-fetch. Since this is a major naming change (I'm not too
> > happy about it, personally), cg-pull will stay aliased to cg-fetch for
> > at least one (likely two) next major Cogito releases (it also produces a
> > warning when invoked as cg-pull). In the more distant future, cg-pull
> > will slowly become the new name of cg-update, to make it confusing.
>
> Could we keep at least the cg-update name?

yes, I want to retain it. I'm not 100% decided yet whether to actually
use the pull term for anything in Cogito. Previous usage reportedly
confused some, the new usage actually confuses me and apparently some
other people. So I might just avoid the 'pull' term in the future
altogether. Not decided yet, though, and opinions obviously welcomed.

> It is certainly not a *pull* because it does update local repository
> (and tree, too).

AIUI, that's what makes it a pull for *cough* some people. ;-)

--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/

VI has two modes: the one in which it beeps and the one in which
it doesn't.

Linus Torvalds

unread,
Sep 19, 2005, 9:00:07 PM9/19/05
to

On Tue, 20 Sep 2005, Pavel Machek wrote:
>
> Could we keep at least the cg-update name? It is certainly not a
> *pull* because it does update local repository (and tree, too).

That _is_ what "pull" means.

"fetch" is the one that only updates the history. A "pull" also does a
merge and updates the current branch _and_ the currently checked out tree.

Linus

0 new messages