[ANNOUNCE] GIT 1.5.6.2

[ANNOUNCE] GIT 1.5.6.2

[Junio C Hamano]

The latest maintenance release GIT 1.5.6.2 are available at the usual
places:

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

  git-1.5.6.2.tar.{gz,bz2}			(source tarball)
  git-htmldocs-1.5.6.2.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.5.6.2.tar.{gz,bz2}		(preformatted docs)

The RPM binary packages for a few architectures are also provided as
courtesy.  As the machine I cut them at kernel.org has been updated to FC9
recently, their filenames now have .fc9. in them.

  RPMS/$arch/git-*-1.5.6.2-1.fc9.$arch.rpm	(RPM)

There still are a handful more fixes queued for 'maint' so we might see
another maintenance release, 1.5.6.3, not too far in the future.

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

Changes since v1.5.6.1 are as follows:

Avery Pennarun (1):
      git-svn: avoid filling up the disk with temp files.

Björn Steinbrink (1):
      git cat-file: Fix memory leak in batch mode

Eric Wong (1):
      git-svn: don't sanitize remote names in config

Jeff King (3):
      fetch: report local storage errors in status table
      doc/rev-parse: clarify reflog vs --until for specifying revisions
      fetch: give a hint to the user when local refs fail to update

Jochen Voss (1):
      avoid off-by-one error in run_upload_archive

Joey Hess (1):
      fix git config example syntax

Johannes Schindelin (2):
      clone: respect url.insteadOf setting in global configs
      clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig

Junio C Hamano (9):
      Allow "git-reset path" when unambiguous
      diff --check: do not discard error status upon seeing a good line
      git-shell: accept "git foo" form
      GIT 1.5.4.6
      GIT 1.5.5.5
      Start draft release notes for 1.5.6.2
      Work around gcc warnings from curl headers
      Fix executable bits in t/ scripts
      GIT 1.5.6.2

Shawn O. Pearce (1):
      Fix describe --tags --long so it does not segfault

Thomas Rast (1):
      Fix 'git show' on signed tag of signed tag of commit

Re: [ANNOUNCE] GIT 1.5.6.2

[Jakub Narebski]

Junio C Hamano <gitster@pobox.com> writes:

> The RPM binary packages for a few architectures are also provided as
> courtesy.  As the machine I cut them at kernel.org has been updated to FC9
> recently, their filenames now have .fc9. in them.
> 
>   RPMS/$arch/git-*-1.5.6.2-1.fc9.$arch.rpm	(RPM)

This unfortunately includes also SRPMS (.src.rpm), even though the
source RPM from git repository is not distribution specific.  I think
that src.rpm should drop '.fc9.' from name

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: [ANNOUNCE] GIT 1.5.6.2

[Junio C Hamano]

Jakub Narebski <jnareb@gmail.com> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> The RPM binary packages for a few architectures are also provided as
>> courtesy.  As the machine I cut them at kernel.org has been updated to FC9
>> recently, their filenames now have .fc9. in them.
>> 
>>   RPMS/$arch/git-*-1.5.6.2-1.fc9.$arch.rpm	(RPM)
>
> This unfortunately includes also SRPMS (.src.rpm), even though the
> source RPM from git repository is not distribution specific.  I think
> that src.rpm should drop '.fc9.' from name

It is whatever rpmbuild command does.  Not my problem.

Having said that, I vaguely recall some people from non Fedora nor RH
distros based on RPM were talking about how their .spec file would be
different from the one for FC.  Presumably the resulting SRPM would be
also distro specific, wouldn't it?

Re: [ANNOUNCE] GIT 1.5.6.2

[Jan Engelhardt]

On Sunday 2008-07-06 07:34, Junio C Hamano wrote:
>Junio C Hamano (9):
>      Allow "git-reset path" when unambiguous
>      diff --check: do not discard error status upon seeing a good line
>      git-shell: accept "git foo" form
>      GIT 1.5.4.6
>      GIT 1.5.5.5
>      Start draft release notes for 1.5.6.2
>      Work around gcc warnings from curl headers
>      Fix executable bits in t/ scripts
>      GIT 1.5.6.2

Three git versions?

Re: [ANNOUNCE] GIT 1.5.6.2

[Mikael Magnusson]

2008/7/6 Jan Engelhardt <jengelh@medozas.de>:
>
> On Sunday 2008-07-06 07:34, Junio C Hamano wrote:
>>Junio C Hamano (9):
>>      Allow "git-reset path" when unambiguous
>>      diff --check: do not discard error status upon seeing a good line
>>      git-shell: accept "git foo" form
>>      GIT 1.5.4.6
>>      GIT 1.5.5.5
>>      Start draft release notes for 1.5.6.2
>>      Work around gcc warnings from curl headers
>>      Fix executable bits in t/ scripts
>>      GIT 1.5.6.2
>
> Three git versions?

I believe this is related to moving to the dash-less form of receive-pack et al.

-- 
Mikael Magnusson

Test breakage [Re: [ANNOUNCE] GIT 1.5.6.2]

[Michael J Gruber]

Junio C Hamano venit, vidit, dixit 06.07.2008 07:34:
> The latest maintenance release GIT 1.5.6.2 are available at the usual
> places:
...

On Kubuntu 7.10 (not my choice, this is at work...), "make test" gives:

*** t9600-cvsimport.sh ***
*   ok 1: setup cvsroot
*   ok 2: setup a cvs module
*   ok 3: import a trivial module
*   ok 4: pack refs
*   ok 5: update cvs module
* FAIL 6: update git module


                 cd module-git &&
                 git cvsimport -a -z 0 module &&
                 git merge origin &&
                 cd .. &&
                 test_cmp module-cvs/o_fortuna module-git/o_fortuna


*   ok 7: update cvs module
*   ok 8: cvsimport.module config works
*   ok 9: import from a CVS working tree
* failed 1 among 9 test(s)

On the second (and subsequent) run, "make test" succeeds. I tried again 
with a fresh copy from the tarball, same effect: failure on 1, success 
on 2 and following.

This is with LANG=de_DE.UTF-8, whereas with LANG=C the tests succeed the 
first time already. Are tests supposed to be done in C locale only? Do 
they reuse data from a previous test run? I didn't notice this with 1.5.6.1.

Michael

Re: Test breakage [Re: [ANNOUNCE] GIT 1.5.6.2]

[Jeff King]

On Mon, Jul 07, 2008 at 02:44:49PM +0200, Michael J Gruber wrote:

> On Kubuntu 7.10 (not my choice, this is at work...), "make test" gives:
>
> *** t9600-cvsimport.sh ***
> [...]
> * FAIL 6: update git module
>                 cd module-git &&
>                 git cvsimport -a -z 0 module &&
>                 git merge origin &&
>                 cd .. &&
>                 test_cmp module-cvs/o_fortuna module-git/o_fortuna
>
> On the second (and subsequent) run, "make test" succeeds. I tried again  
> with a fresh copy from the tarball, same effect: failure on 1, success on 
> 2 and following.

I tried reproducing on my Debian box with various weaks of $LANG, but I
couldn't. Can you please try running "./t9600-cvsimport.sh -v -i" and
send us the output of a failing instance. It's not clear which step in
failing test is causing the problem, or if cvsps is giving off any
useful errors.

> This is with LANG=de_DE.UTF-8, whereas with LANG=C the tests succeed the  
> first time already. Are tests supposed to be done in C locale only? Do  
> they reuse data from a previous test run? I didn't notice this with 
> 1.5.6.1.

They should be perfectly repeatable, but I have run into problems in the
past with cruft in my ~/.cvsps directory. However, we should be setting
$HOME properly in t9600 to avoid this, so I'm not sure what the culprit
is.

-Peff

Re: Test breakage [Re: [ANNOUNCE] GIT 1.5.6.2]

[Michael J Gruber]

Jeff King venit, vidit, dixit 08.07.2008 07:16:
> On Mon, Jul 07, 2008 at 02:44:49PM +0200, Michael J Gruber wrote:
> 
>> On Kubuntu 7.10 (not my choice, this is at work...), "make test" gives:
>>
>> *** t9600-cvsimport.sh ***
>> [...]
>> * FAIL 6: update git module
>>                 cd module-git &&
>>                 git cvsimport -a -z 0 module &&
>>                 git merge origin &&
>>                 cd .. &&
>>                 test_cmp module-cvs/o_fortuna module-git/o_fortuna
>>
>> On the second (and subsequent) run, "make test" succeeds. I tried again  
>> with a fresh copy from the tarball, same effect: failure on 1, success on 
>> 2 and following.
> 
> I tried reproducing on my Debian box with various weaks of $LANG, but I
> couldn't. Can you please try running "./t9600-cvsimport.sh -v -i" and
> send us the output of a failing instance. It's not clear which step in
> failing test is causing the problem, or if cvsps is giving off any
> useful errors.
> 
>> This is with LANG=de_DE.UTF-8, whereas with LANG=C the tests succeed the  
>> first time already. Are tests supposed to be done in C locale only? Do  
>> they reuse data from a previous test run? I didn't notice this with 
>> 1.5.6.1.
> 
> They should be perfectly repeatable, but I have run into problems in the
> past with cruft in my ~/.cvsps directory. However, we should be setting
> $HOME properly in t9600 to avoid this, so I'm not sure what the culprit
> is.

Sure enough, I can't reproduce it today. I reproduced that effect 
several times yesterday, or else I would not have reported anything. 
Trying the very same steps today the tests succeed on the first run. 
Only differences between yesterday and today are be:

- I installed git 1.5.6.2 now (had 1.5.6.1 before) under $HOME, with 
PATH, PERL5LIB, LD_LIBRARY_PATH set accordingly; but tests should pick 
up git stuff from the local build dir, right?

- There may have been an automated update to kubuntu meanwhile, but I 
don't think so; cvsps is under $HOME anyways, and what else would 
matter? Perl version maybe?

So it's WORKSFORME now. Sorry for the noise. Next time I'll not only try 
to reproduce (as I did) but wait a day also!

Best
Michael

[ANNOUNCE] GIT 1.5.6.3

[Junio C Hamano]

The latest maintenance release GIT 1.5.6.3 is available at the
usual places:

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

  git-1.5.6.3.tar.{gz,bz2}			(source tarball)
  git-htmldocs-1.5.6.3.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.5.6.3.tar.{gz,bz2}		(preformatted docs)

The RPM binary packages for a few architectures are also provided
as courtesy.  As the machine I cut them at kernel.org has been updated to FC9
recently, their filenames now have "fc9" in them.

  RPMS/$arch/git-*-1.5.6.3-1.fc9.$arch.rpm	(RPM)

The changes since the previous maintenance release is getting smaller.
About half the diff is in Documentation/ section.

 Documentation/RelNotes-1.5.6.3.txt     |   52 ++++++++++++++++++++++++++++++++
 Documentation/git-cvsimport.txt        |    6 ++++
 Documentation/git-cvsserver.txt        |    3 ++
 Documentation/git-mailinfo.txt         |    5 ++-
 Documentation/git-rev-parse.txt        |    4 +-
 Documentation/git.txt                  |    3 +-
 Documentation/gitattributes.txt        |   33 ++++++++++----------
 Documentation/gitcvs-migration.txt     |    5 +++
 Documentation/pretty-formats.txt       |    8 ++--
 RelNotes                               |    2 +-
 builtin-clone.c                        |    8 +++--
 builtin-commit.c                       |   11 ++----
 builtin-log.c                          |   16 ++-------
 builtin-mailinfo.c                     |    3 +-
 builtin-send-pack.c                    |    3 +-
 builtin-tag.c                          |    2 +-
 contrib/completion/git-completion.bash |   30 ++++++++++++++++++
 convert.c                              |   25 +++++----------
 diff.c                                 |    8 +----
 git-am.sh                              |    3 +-
 git-submodule.sh                       |    3 +-
 git-svn.perl                           |    2 +
 http.c                                 |   36 +++++++--------------
 path.c                                 |    2 +-
 read-cache.c                           |   16 ++++++++++
 refs.c                                 |    2 +-
 run-command.c                          |    2 +
 t/t0004-unwritable.sh                  |   19 ++++++-----
 t/t1301-shared-repo.sh                 |   23 ++++++++++++++
 t/t5404-tracking-branches.sh           |    7 ++++
 t/t5601-clone.sh                       |   20 +++++++++++-
 transport.c                            |    4 ++-
 32 files changed, 253 insertions(+), 113 deletions(-)

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

GIT v1.5.6.3 Release Notes
==========================

Fixes since v1.5.6.2
--------------------

* Setting core.sharerepository to traditional "true" value was supposed to make
  the repository group writable but should not affect permission for others.
  However, since 1.5.6, it was broken to drop permission for others when umask is
  022, making the repository unreadable by others.

* Setting GIT_TRACE will report spawning of external process via run_command().

* Using an object with very deep delta chain pinned memory needed for extracting
  intermediate base objects unnecessarily long, leading to excess memory usage.

* Bash completion script did not notice '--' marker on the command
  line and tried the relatively slow "ref completion" even when
  completing arguments after one.

* Registering a non-empty blob racily and then truncating the working
  tree file for it confused "racy-git avoidance" logic into thinking
  that the path is now unchanged.

* The section that describes attributes related to git-archive were placed
  in a wrong place in the gitattributes(5) manual page.

* "git am" was not helpful to the users when it detected that the committer
  information is not set up properly yet.

* "git clone" had a leftover debugging fprintf().

* "git clone -q" was not quiet enough as it used to and gave object count
  and progress reports.

* "git clone" marked downloaded packfile with .keep; this could be a
  good thing if the remote side is well packed but otherwise not,
  especially for a project that is not really big.

* "git daemon" used to call syslog() from a signal handler, which
  could raise signals of its own but generally is not reentrant.  This
  was fixed by restructuring the code to report syslog() after the handler
  returns.

* When "git push" tries to remove a remote ref, and corresponding
  tracking ref is missing, we used to report error (i.e. failure to
  remove something that does not exist).

* "git mailinfo" (hence "git am") did not handle commit log messages in a
  MIME multipart mail correctly.

Contains other various documentation fixes.