[ANNOUNCE] GIT 1.5.2.2

[ANNOUNCE] GIT 1.5.2.2

[Junio C Hamano]

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

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

  git-1.5.2.2.tar.{gz,bz2}			(tarball)
  git-htmldocs-1.5.2.2.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.5.2.2.tar.{gz,bz2}		(preformatted docs)
  RPMS/$arch/git-*-1.5.2.2-1.$arch.rpm	(RPM)

GIT v1.5.2.2 Release Notes
==========================

Fixes since v1.5.2.1
--------------------

* Usability fix

  - git-gui is shipped with its updated blame interface.  It is
    rumored that the older one was not just unusable but was
    active health hazard, but this one is actually pretty.
    Please see for yourself.

* Bugfixes

  - "git checkout fubar" was utterly confused when there is a
    branch fubar and a tag fubar at the same time.  It correctly
    checks out the branch fubar now.

  - "git clone /path/foo" to clone a local /path/foo.git
    repository left an incorrect configuration.

  - "git send-email" correctly unquotes RFC 2047 quoted names in
    the patch-email before using their values.

  - We did not accept number of seconds since epoch older than
    year 2000 as a valid timestamp.  We now interpret positive
    integers more than 8 digits as such, which allows us to
    express timestamps more recent than March 1973.

  - git-cvsimport did not work when you have GIT_DIR to point
    your repository at a nonstandard location.

  - Some systems (notably, Solaris) lack hstrerror() to make
    h_errno human readable; prepare a replacement
    implementation.

  - .gitignore file listed git-core.spec but what we generate is
    git.spec, and nobody noticed for a long time.

  - "git-merge-recursive" does not try to run file level merge
    on binary files.

  - "git-branch --track" did not create tracking configuration
    correctly when the branch name had slash in it.

  - The email address of the user specified with user.email
    configuration was overriden by EMAIL environment variable.

  - The tree parser did not warn about tree entries with
    nonsense file modes, and assumed they must be blobs.

  - "git log -z" without any other request to generate diff still
    invoked the diff machinery, wasting cycles.

* Documentation

  - Many updates to fix stale or missing documentation.

  - Although our documentation was primarily meant to be formatted
    with AsciiDoc7, formatting with AsciiDoc8 is supported better.


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

Changes since v1.5.2.1 are as follows:

Alex Riesen (3):
      Make the installation target of git-gui a little less chatty
      Fix clone to setup the origin if its name ends with .git
      Add a local implementation of hstrerror for the system which do not have it

Gerrit Pape (1):
      Fix typo in remote branch example in git user manual

J. Bruce Fields (4):
      user-manual: quick-start updates
      user-manual: add a missing section ID
      Documentation: user-manual todo
      tutorial: use "project history" instead of "changelog" in header

Jakub Narebski (1):
      Generated spec file to be ignored is named git.spec and not git-core.spec

Johannes Schindelin (2):
      Move buffer_is_binary() to xdiff-interface.h
      merge-recursive: refuse to merge binary files

Johannes Sixt (1):
      Accept dates before 2000/01/01 when specified as seconds since the epoch

Junio C Hamano (6):
      checkout: do not get confused with ambiguous tag/branch names
      $EMAIL is a last resort fallback, as it's system-wide.
      git-branch --track: fix tracking branch computation.
      Avoid diff cost on "git log -z"
      Documentation: adjust to AsciiDoc 8
      GIT 1.5.2.2

Kristian H淡gsberg (1):
      Unquote From line from patch before comparing with given from address.

Luiz Fernando N. Capitulino (1):
      git-cherry: Document 'limit' command-line option

Matthijs Melchior (1):
      New selection indication and softer colors

Michael Milligan (1):
      git-cvsimport: Make sure to use $git_dir always instead of .git sometimes

Sam Vilain (2):
      fix documentation of unpack-objects -n
      Don't assume tree entries that are not dirs are blobs

Shawn O. Pearce (47):
      git-gui: Allow creating a branch when none exists
      git-gui: Allow as few as 0 lines of diff context
      git-gui: Don't quit when we destroy a child widget
      git-gui: Attach font_ui to all spinbox widgets
      git-gui: Verify Tcl/Tk is new enough for our needs
      Revert "Make the installation target of git-gui a little less chatty"
      git-gui: Add a 4 digit commit abbreviation to the blame viewer
      git-gui: Cleanup blame::new widget initialization
      git-gui: Remove empty blank line at end of blame
      git-gui: Improve the coloring in blame viewer
      git-gui: Simplify consecutive lines that come from the same commit
      git-gui: Use arror cursor in blame viewer file data
      git-gui: Display tooltips in blame viewer
      git-gui: Highlight the blame commit header from everything else
      git-gui: Remove unnecessary reshow of blamed commit
      git-gui: Cleanup minor style nit
      git-gui: Space the commit group continuation out in blame view
      git-gui: Show author initials in blame groups
      git-gui: Allow the user to control the blame/commit split point
      git-gui: Display a progress bar during blame annotation gathering
      git-gui: Allow digging through history in blame viewer
      git-gui: Combine blame groups only if commit and filename match
      git-gui: Show original filename in blame tooltip
      git-gui: Use a label instead of a button for the back button
      git-gui: Clip the commit summaries in the blame history menu
      git-gui: Remove the loaded column from the blame viewer
      git-gui: Remove unnecessary space between columns in blame viewer
      git-gui: Use lighter colors in blame view
      git-gui: Make the line number column slightly wider in blame
      git-gui: Automatically expand the line number column as needed
      git-gui: Remove unused commit_list from blame viewer
      git-gui: Better document our blame variables
      git-gui: Cleanup redundant column management in blame viewer
      git-gui: Switch internal blame structure to Tcl lists
      git-gui: Label the uncommitted blame history entry
      git-gui: Rename fields in blame viewer to better descriptions
      git-gui: Display the "Loading annotation..." message in italic
      git-gui: Run blame twice on the same file and display both outputs
      git-gui: Display both commits in our tooltips
      git-gui: Jump to original line in blame viewer
      git-gui: Use three colors for the blame viewer background
      git-gui: Improve our labeling of blame annotation types
      git-gui: Favor the original annotations over the recent ones
      git-gui: Changed blame header bar background to match main window
      git-gui: Include 'war on whitespace' fixes from git.git
      git-gui: Give amend precedence to HEAD over MERGE_MSG
      git-gui: Save geometry before the window layout is damaged

william pursell (1):
      Make command description imperative statement, not third-person present.

Re: [ANNOUNCE] GIT 1.5.2.2

[Arkadiusz Miskiewicz]

On Sunday 17 of June 2007, Junio C Hamano wrote:
> The latest maintenance release GIT 1.5.2.2 is available at the
> usual places:
>
>   http://www.kernel.org/pub/software/scm/git/
>
>   git-1.5.2.2.tar.{gz,bz2}			(tarball)
>   git-htmldocs-1.5.2.2.tar.{gz,bz2}		(preformatted docs)
>   git-manpages-1.5.2.2.tar.{gz,bz2}		(preformatted docs)
>   RPMS/$arch/git-*-1.5.2.2-1.$arch.rpm	(RPM)

Should git testsuite (make test) go without any problem? (I'm asking because 
some projects have test suites where some tests are expected to fail).

I have 4 failures on amd64/linux and this git release:

* FAIL 11: compare delta flavors

                perl -e '
                        defined($_ = -s $_) or die for @ARGV;
                        exit 1 if $ARGV[0] <= $ARGV[1];
                ' test-2-$packname_2.pack test-3-$packname_3.pack

[...]

* FAIL 16: corrupt a pack and see if verify catches
        cat test-1-${packname_1}.idx >test-3.idx &&
             cat test-2-${packname_2}.pack >test-3.pack &&
             if git-verify-pack test-3.idx
             then false
             else :;
             fi &&

             : PACK_SIGNATURE &&
             cat test-1-${packname_1}.pack >test-3.pack &&
             dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=2 
&&
             if git-verify-pack test-3.idx
             then false
             else :;
             fi &&

             : PACK_VERSION &&
             cat test-1-${packname_1}.pack >test-3.pack &&
             dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=7 
&&
             if git-verify-pack test-3.idx
             then false
             else :;
             fi &&

             : TYPE/SIZE byte of the first packed object data &&
             cat test-1-${packname_1}.pack >test-3.pack &&
             dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=12 
&&
             if git-verify-pack test-3.idx
             then false
             else :;
             fi &&

             : sum of the index file itself &&
             l=`wc -c <test-3.idx` &&
             l=`expr $l - 20` &&
             cat test-1-${packname_1}.pack >test-3.pack &&
             dd if=/dev/zero of=test-3.idx count=20 bs=1 conv=notrunc seek=$l 
&&
             if git-verify-pack test-3.pack
             then false
             else :;
             fi &&

             :

[...]

* FAIL 18: fake a SHA1 hash collision
        test -f .git/objects/c8/2de19312b6c3695c0c18f70709a6c535682a67 &&
             cp -f      .git/objects/9d/235ed07cd19811a6ceb342de82f190e49c9f68 
\
                        .git/objects/c8/2de19312b6c3695c0c18f70709a6c535682a67
* FAIL 19: make sure index-pack detects the SHA1 collision
        git-index-pack -o bad.idx test-3.pack
* failed 4 among 19 test(s)


-- 
Arkadiusz Miśkiewicz        PLD/Linux Team
arekm / maven.pl            http://ftp.pld-linux.org/

Re: [ANNOUNCE] GIT 1.5.2.2

[Shawn O. Pearce]

Junio C Hamano <gitster@pobox.com> wrote:
> GIT v1.5.2.2 Release Notes
> ==========================
> 
> Fixes since v1.5.2.1
> --------------------
> 
> * Usability fix
> 
>   - git-gui is shipped with its updated blame interface.  It is
>     rumored that the older one was not just unusable but was
>     active health hazard, but this one is actually pretty.
>     Please see for yourself.

Usability fix?  More like finally implemented!  _Now_ we can start
to work on improving its usability.  ;-)

-- 
Shawn.

Re: [ANNOUNCE] GIT 1.5.2.2

[Shawn O. Pearce]

Arkadiusz Miskiewicz <arekm@maven.pl> wrote:
> On Sunday 17 of June 2007, Junio C Hamano wrote:
> > The latest maintenance release GIT 1.5.2.2 is available at the
> > usual places:
> >
> >   http://www.kernel.org/pub/software/scm/git/
> >
> >   git-1.5.2.2.tar.{gz,bz2}			(tarball)
> >   git-htmldocs-1.5.2.2.tar.{gz,bz2}		(preformatted docs)
> >   git-manpages-1.5.2.2.tar.{gz,bz2}		(preformatted docs)
> >   RPMS/$arch/git-*-1.5.2.2-1.$arch.rpm	(RPM)
> 
> Should git testsuite (make test) go without any problem? (I'm asking because 
> some projects have test suites where some tests are expected to fail).

No, our test suite should always pass.  Junio does not ship a release
of Git where the test suite fails on his standard systems.  We have
a lot of users running the current `master` and `next` branches on
a lot of different platforms, so usually platform specific breakages
are caught relatively early, before a release gets made.

We do have tests we expect to fail, but then the test suite has an
inversion in it.  That is the test only passes if the underlying
operation failed.  ;-)

> I have 4 failures on amd64/linux and this git release:
...
> * FAIL 16: corrupt a pack and see if verify catches
>         cat test-1-${packname_1}.idx >test-3.idx &&
>              cat test-2-${packname_2}.pack >test-3.pack &&

Hmm.  That is t5300-pack-objects.sh.  Something is really fishy
if that test failed.  We destroy a packfile and then look to see
if the SHA-1 hash detects the change.  It always does.  So uh,
what's up with your hardware that it doesn't fail?

I just built 1.5.2.2 on one of my Gentoo Linux amd64 systems and I'm
not seeing any failures from the test suite.  Not that I expected
to find any; Linux amd64 is popular enough that a number of people
run it.

-- 
Shawn.

Re: [ANNOUNCE] GIT 1.5.2.2

[Arkadiusz Miskiewicz]

On Monday 18 of June 2007, Shawn O. Pearce wrote:
> Arkadiusz Miskiewicz <arekm@maven.pl> wrote:
> > On Sunday 17 of June 2007, Junio C Hamano wrote:
> > > The latest maintenance release GIT 1.5.2.2 is available at the
> > > usual places:

[...]

> > Should git testsuite (make test) go without any problem? (I'm asking
> > because some projects have test suites where some tests are expected to
> > fail).
>
[...] 

>
> > * FAIL 16: corrupt a pack and see if verify catches
> >         cat test-1-${packname_1}.idx >test-3.idx &&
> >              cat test-2-${packname_2}.pack >test-3.pack &&
>
> Hmm.  That is t5300-pack-objects.sh.  Something is really fishy
> if that test failed.  We destroy a packfile and then look to see
> if the SHA-1 hash detects the change.  It always does.  So uh,
> what's up with your hardware that it doesn't fail?

There is no problems known with this hardware (kernel builds are frequently 
done on it and no problem occured so far). Test suite fails in the same place 
each time I'm running it.

> I just built 1.5.2.2 on one of my Gentoo Linux amd64 systems and I'm
> not seeing any failures from the test suite.  Not that I expected
> to find any; Linux amd64 is popular enough that a number of people
> run it.

Not all have the same enviroment. 

coreutils-6.9-2.x86_64
curl-7.16.2-1.x86_64
diffutils-2.8.7-4.x86_64
expat-2.0.0-3.x86_64
findutils-4.2.31-1.x86_64
gcc-4.2.0-6.x86_64
glibc-2.6-1.i686
glibc-2.6-1.x86_64
grep-2.5.1a-2.x86_64
openssl-0.9.8e-4.x86_64
perl-5.8.8-11.x86_64
python-2.5.1-2.x86_64
sed-4.1.5-2.x86_64
zlib-1.2.3-4.x86_64


If anyone is interested in debugging that problem then I can give ssh access 
to this machine.

-- 
Arkadiusz Miśkiewicz        PLD/Linux Team
arekm / maven.pl            http://ftp.pld-linux.org/

Re: [ANNOUNCE] GIT 1.5.2.2

[Shawn O. Pearce]

Arkadiusz Miskiewicz <arekm@maven.pl> wrote:
> On Monday 18 of June 2007, Shawn O. Pearce wrote:
> > Arkadiusz Miskiewicz <arekm@maven.pl> wrote:
> > > * FAIL 16: corrupt a pack and see if verify catches
> > >         cat test-1-${packname_1}.idx >test-3.idx &&
> > >              cat test-2-${packname_2}.pack >test-3.pack &&
> >
> > Hmm.  That is t5300-pack-objects.sh.
> 
> If anyone is interested in debugging that problem then I can give ssh access 
> to this machine.

How about we start with the output of:

  cd t && ./t5300-pack-objects.sh -v

?  That should be a lot more verbose, as it will include the
commands we are running and their stdout/stderr.  Sometimes fun
details about broken tools can be easily obtained from that output.

-- 
Shawn.

Re: [ANNOUNCE] GIT 1.5.2.2

[Arkadiusz Miskiewicz]

On Monday 18 of June 2007, Shawn O. Pearce wrote:
> Arkadiusz Miskiewicz <arekm@maven.pl> wrote:
> > On Monday 18 of June 2007, Shawn O. Pearce wrote:
> > > Arkadiusz Miskiewicz <arekm@maven.pl> wrote:
> > > > * FAIL 16: corrupt a pack and see if verify catches
> > > >         cat test-1-${packname_1}.idx >test-3.idx &&
> > > >              cat test-2-${packname_2}.pack >test-3.pack &&
> > >
> > > Hmm.  That is t5300-pack-objects.sh.
> >
> > If anyone is interested in debugging that problem then I can give ssh
> > access to this machine.
>
> How about we start with the output of:
>
>   cd t && ./t5300-pack-objects.sh -v
>
> ?  That should be a lot more verbose, as it will include the
> commands we are running and their stdout/stderr.  Sometimes fun
> details about broken tools can be easily obtained from that output.

The reason was... missing /dev/zero! :-) Mystery solved, thanks!

-- 
Arkadiusz Miśkiewicz        PLD/Linux Team
arekm / maven.pl            http://ftp.pld-linux.org/

Re: [ANNOUNCE] GIT 1.5.2.2

[Jakub Narebski]

Junio C Hamano wrote:

>   - git-gui is shipped with its updated blame interface.  It is
>     rumored that the older one was not just unusable but was
>     active health hazard, but this one is actually pretty.
>     Please see for yourself.

I like the new interface very much, especially the info about who
made the change, and who moved the change to present place.

It would be nice though to have git-gui(1) man page describing 'blame'
subcommand of git-gui,, or have "git blame --gui" invoke "git gui blame".
gitk has it's manpage, why not git-gui? AFAICT there is currently no way to
discover this wonderfull tool given only manpages and git-gui help.

Perhaps file browser in git-gui should have "Blame"/"Annotate" button?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

[ANNOUNCE] GIT 1.5.2.4

[Junio C Hamano]

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

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

  git-1.5.2.4.tar.{gz,bz2}			(tarball)
  git-htmldocs-1.5.2.4.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.5.2.4.tar.{gz,bz2}		(preformatted docs)
  RPMS/$arch/git-*-1.5.2.4-1.$arch.rpm	(RPM)

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

GIT v1.5.2.4 Release Notes
==========================

Fixes since v1.5.2.3
--------------------

 * Bugfixes

   - "git-gui" bugfixes, including a handful fixes to run it
     better on Cygwin/MSYS.

   - "git checkout" failed to switch back and forth between
     branches, one of which has "frotz -> xyzzy" symlink and
     file "xyzzy/filfre", while the other one has a file
     "frotz/filfre".

   - "git prune" used to segfault upon seeing a commit that is
     referred to by a tree object (aka "subproject").

   - "git diff --name-status --no-index" mishandled an added file.

   - "git apply --reverse --whitespace=warn" still complained
     about whitespaces that a forward application would have
     introduced.

 * Documentation Fixes and Updates

   - A handful documentation updates.

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

Changes since v1.5.2.3 are as follows:

Andy Parkins (2):
      Make git-prune submodule aware (and fix a SEGFAULT in the process)
      user-manual: grammar and style fixes

Gerrit Pape (1):
      git-gui: properly popup error if gitk should be started but is not installed

J. Bruce Fields (2):
      tutorial: Fix typo
      user-manual: more explanation of push and pull usage

Jim Meyering (1):
      Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long

Johannes Schindelin (3):
      diff --no-index: fix --name-status with added files
      glossary: add 'reflog'
      Fix "apply --reverse" with regard to whitespace

Junio C Hamano (2):
      Teach read-tree 2-way merge to ignore intermediate symlinks
      GIT 1.5.2.4

Michael Hendricks (1):
      Correctly document the name of the global excludes file configuration

Miklos Vajna (1):
      Document -<n> for git-format-patch

Shawn O. Pearce (10):
      git-gui: Unlock the index when cancelling merge dialog
      git-gui: Don't bind F5/M1-R in all windows
      git-gui: Bind M1-P to push action
      git-gui: Include a Push action on the left toolbar
      git-gui: Ensure windows shortcuts always have .bat extension
      git-gui: Skip nicknames when selecting author initials
      git-gui: Correct ls-tree buffering problem in browser
      git-gui: Don't linewrap within console windows
      Clarify documentation of fast-import's D subcommand
      git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}

William Pursell (1):
      user-manual: fix directory name in git-archive example