git, branch v1.7.11-rc3

Git 1.7.11-rc3

2012-06-12T16:10:52Z

Signed-off-by: Junio C Hamano

Merge git://github.com/git-l10n/git-po

2012-06-12T16:08:35Z

Updates to German, Vietnamese and simplified Chinese translation. * git://github.com/git-l10n/git-po: l10n: de.po: translate 27 new messages l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb l10n: zh_CN.po: translate 27 new messages l10n: Update git.pot (27 new, 1 removed messages)

Merge git://github.com/ralfth/git-po-de

2012-06-12T15:41:05Z

By Ralf Thielow via Ralf Thielow * github.com/ralfth/git-po-de: l10n: de.po: translate 27 new messages

Merge branch 'mm/api-credentials-doc'

2012-06-12T15:40:16Z

* mm/api-credentials-doc: api-credential.txt: document that helpers field is filled-in automatically

Merge branch 'jc/fmt-merge-msg-people'

2012-06-12T15:33:30Z

Tone down the lines that credit people involved and make them comments, so that integrators who edit their merge messages can still make use of the information, but lazy ones will not leave the unverified guesses placed on the "via" line. * jc/fmt-merge-msg-people: fmt-merge-msg: make attribution into comment lines

api-credential.txt: document that helpers field is filled-in automatically

2012-06-12T14:48:40Z

It was unclear whether the field was to be specified by the user of the API. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'js/maint-fast-export-mark-error'

2012-06-12T14:27:50Z

* js/maint-fast-export-mark-error: fast-export: report SHA-1 instead of gibberish when marks exist already

fast-export: report SHA-1 instead of gibberish when marks exist already

2012-06-12T14:25:11Z

Cc: Pieter de Bie Signed-off-by: Johannes Schindelin Signed-off-by: Max Horn Signed-off-by: Junio C Hamano

l10n: de.po: translate 27 new messages

2012-06-11T17:04:57Z

Translate 27 new messages came from git.pot update in 7256fd7 (l10n: Update git.pot (27 new, 1 removed messages)). Signed-off-by: Ralf Thielow

git-svn: use YAML format for mergeinfo cache when possible

2012-06-10T08:47:53Z

Since v1.7.0-rc2~11 (git-svn: persistent memoization, 2010-01-30), git-svn has maintained some private per-repository caches in .git/svn/.caches to avoid refetching and recalculating some mergeinfo-related information with every "git svn fetch". These caches use the 'nstore' format from the perl core module Storable, which can be read and written quickly and was designed for transfer over the wire (the 'n' stands for 'network'). This format is endianness-independent and independent of floating-point representation. Unfortunately the format is *not* independent of the perl version --- new perl versions will write files that very old perl cannot read. Worse, the format is not independent of the size of a perl integer. So if you toggle perl's use64bitint compile-time option, then using 'git svn fetch' on your old repositories produces errors like this: Byte order is not compatible at ../../lib/Storable.pm (autosplit into ../../lib/auto/Storable/_retrieve.al) line 380, at /usr/share/perl/5.12/Memoize/Storable.pm line 21 That is, upgrading perl to a version that uses use64bitint for the first time makes git-svn suddenly refuse to fetch in existing repositories. Removing .git/svn/.caches lets git-svn recover. It's time to switch to a platform independent serializer backend with better compatibility guarantees. This patch uses YAML::Any. Other choices were considered: - thawing data from Data::Dumper involves "eval". Doing that without creating a security risk is fussy. - the JSON API works on scalars in memory and doesn't provide a standard way to serialize straight to disk. YAML::Any is reasonably fast and has a pleasant API. In most backends, LoadFile() reads the entire file into a scalar anyway and converts it as a second step, but having an interface that allows the deserialization to happen on the fly without a temporary is still a comfort. YAML::Any is not a core perl module, so we take care to use it when and only when it is available. Installations without that module should fall back to using Storable with all its quirks, keeping their cache files in .git/svn/.caches/*.db Installations with YAML peacefully coexist by keeping a separate set of cache files in .git/svn/.caches/*.yaml. In most cases, switching between is a one-time thing, so it doesn't seem worth the complication to migrate existing caches. The upshot: after this patch, as long as YAML::Any is installed you can move your git repository between machines with different perl installations and "git svn fetch" will work fine. If you do not have YAML::Any, the behavior is unchanged (and in particular does not get any worse). Reported-by: Sandro Weiser Reported-by: Bdale Garbee Signed-off-by: Jonathan Nieder Signed-off-by: Eric Wong