[ANNOUNCE] GIT 1.5.4-rc2

[ANNOUNCE] GIT 1.5.4-rc2

[Junio C Hamano]

GIT 1.5.4-rc2 is available at the usual places:

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

  git-1.5.4.rc2.tar.{gz,bz2}			(tarball)
  git-htmldocs-1.5.4.rc2.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.5.4.rc2.tar.{gz,bz2}		(preformatted docs)
  testing/*-1.5.4.rc2-1.*.rpm			(RPM)

This round we still did not manage to keep non-fixes out, and
you can now tell "git commit" to keep the "# comment" lines in
the message, but otherwise the changes are all fixes, fixes and
fixes.

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

Changes since v1.5.4-rc1 are as follows:

Alex Riesen (1):
      Allow selection of different cleanup modes for commit messages

Arjen Laarhoven (1):
      Fix "git log --diff-filter" bug

Charles Bailey (1):
      Remove old generated files from .gitignore.

Gustaf Hendeby (2):
      Make git send-email accept $EDITOR with arguments
      shortlog manpage documentation: work around asciidoc markup issues

Jakub Narebski (1):
      gitweb: fix whitespace in config_to_multi (indent with tab)

Jeff King (2):
      clean up 1.5.4 release notes
      cvsimport: die on cvsps errors

Jim Meyering (1):
      Don't dereference NULL upon lookup failure.

Johannes Schindelin (2):
      Teach diff machinery to display other prefixes than "a/" and "b/"
      Mention git-shell's "cvs" substitution in the RelNotes

Junio C Hamano (14):
      t4024: fix test script to use simpler sed pattern
      fix git commit --amend -m "new message"
      shell-scripts usage(): consistently exit with non-zero
      Documentation: ls-files -v is about "assume unchanged".
      Fix $EDITOR regression introduced by rewrite in C.
      t7005: do not exit inside test.
      builtin-commit: fix amending of the initial commit
      builtin-commit: avoid double-negation in the code.
      Documentation: describe 'union' low-level merge driver
      Fix documentation of --first-parent in git-log and copy it to git-rev-list
      combine-diff: Fix path quoting
      Fix rewrite_diff() name quoting.
      contrib: resurrect scripted git-revert.
      GIT 1.5.4-rc2

Linus Torvalds (1):
      Re(-re)*fix trim_common_tail()

Miklos Vajna (1):
      everyday: replace 'prune' and 'repack' with 'gc'

Pierre Habouzit (3):
      git-tag: fix -l switch handling regression.
      Force the sticked form for options with optional arguments.
      parse-options: Add a gitcli(5) man page.

René Scharfe (1):
      Make "--pretty=format" parser a bit more careful.

Shawn O. Pearce (2):
      Reallow git-rebase --interactive --continue if commit is unnecessary
      Improve error messages when int/long cannot be parsed from config

Stefan Sperling (1):
      Small comment fix for git-cvsimport.

Wincent Colaiuta (1):
      Emit helpful status for accidental "git stash" save

Re: [ANNOUNCE] GIT 1.5.4-rc2

[Steffen Prohaska]

On Dec 27, 2007, at 4:36 AM, Junio C Hamano wrote:

> GIT 1.5.4-rc2 is available at the usual places:


The msysgit installer is now available at

    http://code.google.com/p/msysgit/downloads

	Steffen

Re: [ANNOUNCE] GIT 1.5.4-rc2

[Luciano Rocha]

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

On Fri, Dec 28, 2007 at 11:43:53AM +0100, Steffen Prohaska wrote:
> 
>  On Dec 27, 2007, at 4:36 AM, Junio C Hamano wrote:
> 
> > GIT 1.5.4-rc2 is available at the usual places:
> 
> 
>  The msysgit installer is now available at
> 
>     http://code.google.com/p/msysgit/downloads
> 

Trying to install it in wine ends with:

Runtime Error (at -1:0):

Cannot Import dll:Kernel32.dll.

That popup appears immediately after running wine
Git-1.5.4-rc2-preview20071228.exe and the installation ends.

I've successfully installed a lot of PortableApps, MinGW/MSys and Vim
with that wine.

-- 
Luciano Rocha <luciano@eurotux.com>
Eurotux Informática, S.A. <http://www.eurotux.com/>

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [ANNOUNCE] GIT 1.5.4-rc2

[Alexandre Julliard]

Luciano Rocha <luciano@eurotux.com> writes:

> On Fri, Dec 28, 2007 at 11:43:53AM +0100, Steffen Prohaska wrote:
>> 
>>  On Dec 27, 2007, at 4:36 AM, Junio C Hamano wrote:
>> 
>> > GIT 1.5.4-rc2 is available at the usual places:
>> 
>> 
>>  The msysgit installer is now available at
>> 
>>     http://code.google.com/p/msysgit/downloads
>> 
>
> Trying to install it in wine ends with:
>
> Runtime Error (at -1:0):
>
> Cannot Import dll:Kernel32.dll.
>
> That popup appears immediately after running wine
> Git-1.5.4-rc2-preview20071228.exe and the installation ends.

That's because it doesn't find CreateHardLinkA. The following Wine patch
should enable the installer to succeed.

diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 7bc5db3..5f6dea6 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -224,8 +224,8 @@
 @ stdcall CreateFileMappingA(long ptr long long long str)
 @ stdcall CreateFileMappingW(long ptr long long long wstr)
 @ stdcall CreateFileW(wstr long long ptr long long long)
-# @ stub CreateHardLinkA
-# @ stub CreateHardLinkW
+@ stub CreateHardLinkA
+@ stub CreateHardLinkW
 @ stdcall CreateIoCompletionPort(long long long long)
 @ stdcall CreateJobObjectA(ptr str)
 @ stdcall CreateJobObjectW(ptr wstr)

-- 
Alexandre Julliard
julliard@winehq.org

Re: [ANNOUNCE] GIT 1.5.4-rc2

[Luciano Rocha]

[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]

On Fri, Dec 28, 2007 at 04:16:26PM +0100, Alexandre Julliard wrote:
> Luciano Rocha <luciano@eurotux.com> writes:
> 
> > On Fri, Dec 28, 2007 at 11:43:53AM +0100, Steffen Prohaska wrote:
> >> 
> >>  On Dec 27, 2007, at 4:36 AM, Junio C Hamano wrote:
> >> 
> >> > GIT 1.5.4-rc2 is available at the usual places:
> >> 
> >> 
> >>  The msysgit installer is now available at
> >> 
> >>     http://code.google.com/p/msysgit/downloads
> >> 
> >
> > Trying to install it in wine ends with:
> >
> > Runtime Error (at -1:0):
> >
> > Cannot Import dll:Kernel32.dll.
> >
> > That popup appears immediately after running wine
> > Git-1.5.4-rc2-preview20071228.exe and the installation ends.
> 
> That's because it doesn't find CreateHardLinkA. The following Wine patch
> should enable the installer to succeed.
> 

Thanks. I won't have time to test it in the comming days, but it makes
sense.

-- 
Luciano Rocha <luciano@eurotux.com>
Eurotux Informática, S.A. <http://www.eurotux.com/>

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]