[ANNOUNCE] GIT 1.6.5.2

[ANNOUNCE] GIT 1.6.5.2

[Junio C Hamano]

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

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

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

The RPM binary packages for a few architectures are found in:

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

GIT v1.6.5.2 Release Notes
==========================

Fixes since v1.6.5.1
--------------------

 * Installation of templates triggered a bug in busybox when using tar
   implementation from it.

 * "git add -i" incorrectly ignored paths that are already in the index
   if they matched .gitignore patterns.

 * "git describe --always" should have produced some output even there
   were no tags in the repository, but it didn't.

 * "git ls-files" when showing tracked files incorrectly paid attention
   to the exclude patterns.

Other minor documentation updates are included.

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

Changes since v1.6.5.1 are as follows:

Andreas Schwab (1):
      Work around option parsing bug in the busybox tar implementation

Carlos R. Mafra (1):
      Makefile: clean block-sha1/ directory instead of mozilla-sha1/

Jeff King (2):
      ls-files: excludes should not impact tracked files
      document push's new quiet option

Joe Perches (1):
      git-send-email.perl: fold multiple entry "Cc:" and multiple single line "RCPT TO:"s

Johannes Sixt (2):
      Remove a left-over file from t/t5100
      Mark files in t/t5100 as UTF-8

Jonathan Nieder (1):
      Documentation: describe check-ref-format --branch

Junio C Hamano (4):
      Fix incorrect error check while reading deflated pack data
      Do not fail "describe --always" in a tag-less repository
      Fix list of released versions in the toc document
      GIT 1.6.5.2

Markus Heidelberg (1):
      t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT test

Matt Kraai (1):
      Documentation/git-gc.txt: change "references" to "reference"

Nanako Shiraishi (2):
      git push: remove incomplete options list from help text
      git push: say that --tag can't be used with --all or --mirror in help text

Nasser Grainawi (1):
      Document `delta` attribute in "git help attributes".

Pauli Virtanen (1):
      git-add--interactive: never skip files included in index

Re: [ANNOUNCE] GIT 1.6.5.2

[Jakub Narebski]

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

> The RPM binary packages for a few architectures are found in:
> 
>   RPMS/$arch/git-*-1.6.5.2-1.fc9.$arch.rpm	(RPM)

I tried to install git from source RPM... and failed:

  $ rpmbuild --rebuild git-1.6.5.2-1.fc11.src.rpm 
  Installing git-1.6.5.2-1.fc11.src.rpm
  warning: user junio does not exist - using root
  warning: group junio does not exist - using root
  error: unpacking of archive failed on file 
    /home/local/builddir/SOURCES/git-1.6.5.2.tar.gz;
    4afb1f6a: cpio: MD5 sum mismatch
  error: git-1.6.5.2-1.fc11.src.rpm cannot be installed

Error messages are line wrapped for better readibility.

Redownloading the file didn't help

  $ ls -l git-1.6.5.2-1.fc11.src.rpm 
  -rw-r--r--  1 jnareb users 2713416 Oct 26 03:59 git-1.6.5.2-1.fc11.src.rpm
  $ md5sum git-1.6.5.2-1.fc11.src.rpm 
  9f89a01b65e1b8e8934c3a2252064632  git-1.6.5.2-1.fc11.src.rpm

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: [ANNOUNCE] GIT 1.6.5.2

[Todd Zullinger]

Jakub Narebski wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> The RPM binary packages for a few architectures are found in:
>>
>>   RPMS/$arch/git-*-1.6.5.2-1.fc9.$arch.rpm	(RPM)
>
> I tried to install git from source RPM... and failed:
>
>   $ rpmbuild --rebuild git-1.6.5.2-1.fc11.src.rpm
>   Installing git-1.6.5.2-1.fc11.src.rpm
>   warning: user junio does not exist - using root
>   warning: group junio does not exist - using root
>   error: unpacking of archive failed on file
>     /home/local/builddir/SOURCES/git-1.6.5.2.tar.gz;
>     4afb1f6a: cpio: MD5 sum mismatch
>   error: git-1.6.5.2-1.fc11.src.rpm cannot be installed
>
> Error messages are line wrapped for better readibility.
>
> Redownloading the file didn't help
>
>   $ ls -l git-1.6.5.2-1.fc11.src.rpm
>   -rw-r--r--  1 jnareb users 2713416 Oct 26 03:59 git-1.6.5.2-1.fc11.src.rpm
>   $ md5sum git-1.6.5.2-1.fc11.src.rpm
>   9f89a01b65e1b8e8934c3a2252064632  git-1.6.5.2-1.fc11.src.rpm

It looks like the kernel.org builders are now using Fedora 11 to
create the packages.  Unfortunately, there were backward-incompatible
changes in rpm.  Stronger hashes are now used and older rpm versions
do not understand these, leading to the error you got.

I don't know what the process is for creating the rpm's, but if it's
under Junio's control, a fix to create packages which can be read by
older rpm versions would be to add:

    --define "_source_filedigest_algorithm md5" \
    --define "_binary_filedigest_algorithm md5"

to the rpmbuild invocation.

Perhaps like this (I didn't test this, though the defines are what we
use in Fedora to create packages on Fedora >= 11 for building on
CentOS and older releases):

-- >8 --
From: Todd Zullinger <tmz@pobox.com>
Subject: [PATCH] Makefile: Ensure rpm packages can be read by older rpm versions

The kernel.org hosts where the packages are built are now using Fedora
11, which defaults to sha256 for file digests instead of md5.  Older
versions of rpm can not handle these packages.  Tell rpmbuild to use md5
file digests for better compatibility.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
---
 Makefile |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 5d5976f..35f5294 100644
--- a/Makefile
+++ b/Makefile
@@ -1806,7 +1806,10 @@ dist: git.spec git-archive$(X) configure
 	gzip -f -9 $(GIT_TARNAME).tar
 
 rpm: dist
-	$(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
+	$(RPMBUILD) \
+		--define "_source_filedigest_algorithm md5" \
+		--define "_binary_filedigest_algorithm md5" \
+		-ta $(GIT_TARNAME).tar.gz
 
 htmldocs = git-htmldocs-$(GIT_VERSION)
 manpages = git-manpages-$(GIT_VERSION)
-- 
1.6.5.2

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Does it follow that I reject all authority? Perish the thought. In the
matter of boots, I defer to the authority of the boot-maker.
    -- Mikhail Bakunin

Re: [ANNOUNCE] GIT 1.6.5.2

[Jakub Narebski]

On Wed, 11 Nov 2009, Todd Zullinger wrote:
> Jakub Narebski wrote:
> > Junio C Hamano <gitster@pobox.com> writes:
> >
> > > The RPM binary packages for a few architectures are found in:
> > >
> > >   RPMS/$arch/git-*-1.6.5.2-1.fc9.$arch.rpm	(RPM)
> >
> > I tried to install git from source RPM... and failed:
> >
> >   $ rpmbuild --rebuild git-1.6.5.2-1.fc11.src.rpm
> >   Installing git-1.6.5.2-1.fc11.src.rpm
> >   warning: user junio does not exist - using root
> >   warning: group junio does not exist - using root
> >   error: unpacking of archive failed on file
> >     /home/local/builddir/SOURCES/git-1.6.5.2.tar.gz;
> >     4afb1f6a: cpio: MD5 sum mismatch
> >   error: git-1.6.5.2-1.fc11.src.rpm cannot be installed
> >
> > Error messages are line wrapped for better readibility.
>
> It looks like the kernel.org builders are now using Fedora 11 to
> create the packages.  Unfortunately, there were backward-incompatible
> changes in rpm.  Stronger hashes are now used and older rpm versions
> do not understand these, leading to the error you got.

Thanks for an information.  

Well, it looks like I would have to use "make rpm" to generate RPM
to install, at least until I finally upgrade my Linux distribution.

-- 
Jakub Narebski
Poland

Re: [ANNOUNCE] GIT 1.6.5.2

[Junio C Hamano]

Todd Zullinger <tmz@pobox.com> writes:

> I don't know what the process is for creating the rpm's, but if it's

It is essentially "make rpm" at the top directory as you found out.

> under Junio's control, a fix to create packages which can be read by
> older rpm versions would be to add:
>
>     --define "_source_filedigest_algorithm md5" \
>     --define "_binary_filedigest_algorithm md5"
>
> to the rpmbuild invocation.

Thanks; will try.  Will that have adverse effect when instsalled to FC11
by the way?

Re: [ANNOUNCE] GIT 1.6.5.2

[Todd Zullinger]

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

Junio C Hamano wrote:
> Thanks; will try.  Will that have adverse effect when instsalled to
> FC11 by the way?

None that I am aware of (aside from using a less secure file digest
algorith, of course :).  I've installed packages built that way on
Fedora 12 systems without issue.

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Blessed are they who can laugh at themselves for they shall never
cease to be amused.


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