threads / announce / 28320

[ANNOUNCE] Git 1.7.6.2

Subject: [ANNOUNCE] Git 1.7.6.2

## tl;dr

5 messages between Sep 6, 2011 and Sep 7, 2011.

replies: 4people: 2as markdown or json

Junio C Hamano· Sep 6, 2011, 23:46 UTC · lore

I've tagged the latest maintenance release Git 1.7.6.2 but unfortunately the tarballs are not available at the usual places. The release can be fetched from any of the following repositories, at the tip of 'maint' branch.

	git://repo.or.cz/alt-git.git
	https://github.com/gitster/git
	https://code.google.com/p/git-core/
	git://git.sourceforge.jp/gitroot/git-core/git.git
	git://git-core.git.sourceforge.net/gitroot/git-core/git-core

This is primarily to fix "git push --quiet" breakage in 1.7.6.1.

----------------------------------------------------------------

Changes since v1.7.6.1 are as follows:

Junio C Hamano (3):
      whitespace: have SP on both sides of an assignment "="
      Revert "Merge branch 'cb/maint-quiet-push' into maint"
      Git 1.7.6.2

Pang Yan Han (1):
      update-ref: whitespace fix

Thomas Rast (1):
      Documentation: clarify effects of -- <path> arguments

Junio C Hamano· Sep 7, 2011, 11:22 UTC · lore

Re: [ANNOUNCE] Git 1.7.6.2

Sverre Rabbelier <srabbelier@gmail.com> writes:

> That's interesting, how did revert a merge commit?

Does "git revert --help" lack the description?

Sverre Rabbelier· Sep 7, 2011, 11:24 UTC · re: Junio C Hamano · lore

Re: [ANNOUNCE] Git 1.7.6.2

Heya,

On Wed, Sep 7, 2011 at 13:22, Junio C Hamano <gitster@pobox.com> wrote:

>> That's interesting, how did revert a merge commit?
>
> Does "git revert --help" lack the description?

It warns that "As a result, later merges will only bring in tree changes introduced by commits that are not ancestors of the previously reverted merge." How would you later re-merge the series when the problems it has are fixed though?

-- 
Cheers,

Sverre Rabbelier

Junio C Hamano· Sep 7, 2011, 18:25 UTC · re: Sverre Rabbelier · lore

Re: [ANNOUNCE] Git 1.7.6.2

Sverre Rabbelier <srabbelier@gmail.com> writes:

> How would you later re-merge the series when the
> problems it has are fixed though?

Simple. I won't re-merge nor allow a fix-up series to be queued on top of the failed topic.

Sverre Rabbelier· Sep 7, 2011, 18:27 UTC · re: Junio C Hamano · lore

Re: [ANNOUNCE] Git 1.7.6.2

Heya,

On Wed, Sep 7, 2011 at 20:25, Junio C Hamano <gitster@pobox.com> wrote:

Show 6 quoted lines

> Sverre Rabbelier <srabbelier@gmail.com> writes:
>> How would you later re-merge the series when the
>> problems it has are fixed though?
>
> Simple. I won't re-merge nor allow a fix-up series to be queued on top of
> the failed topic.

Ah, as long as the reroll has a different sha1 there is no problem, makes sense. Simple yet effective :)

-- 
Cheers,

Sverre Rabbelier