Permalink
Commits on Jun 12, 2012
  1. Git 1.7.11-rc3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 12, 2012
  2. Merge git://github.com/git-l10n/git-po

    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)
    gitster committed Jun 12, 2012
  3. Merge git://github.com/ralfth/git-po-de

    By Ralf Thielow
    via Ralf Thielow
    * github.com/ralfth/git-po-de:
      l10n: de.po: translate 27 new messages
    jiangxin committed Jun 12, 2012
  4. Merge branch 'mm/api-credentials-doc'

    * mm/api-credentials-doc:
      api-credential.txt: document that helpers field is filled-in automatically
    gitster committed Jun 12, 2012
  5. Merge branch 'jc/fmt-merge-msg-people'

    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
    gitster committed Jun 12, 2012
  6. api-credential.txt: document that helpers field is filled-in automati…

    …cally
    
    It was unclear whether the field was to be specified by the user of the
    API.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Jun 11, 2012
  7. Merge branch 'js/maint-fast-export-mark-error'

    * js/maint-fast-export-mark-error:
      fast-export: report SHA-1 instead of gibberish when marks exist already
    gitster committed Jun 12, 2012
  8. fast-export: report SHA-1 instead of gibberish when marks exist already

    Cc: Pieter de Bie <pdebie@ai.rug.nl>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Max Horn <max@quendi.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Jun 12, 2012
Commits on Jun 11, 2012
  1. l10n: de.po: translate 27 new messages

    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 <ralf.thielow@googlemail.com>
    ralfth committed Jun 8, 2012
Commits on Jun 10, 2012
  1. git-svn: use YAML format for mergeinfo cache when possible

    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 <sandro.weiser@informatik.tu-chemnitz.de>
    Reported-by: Bdale Garbee <bdale@gag.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    jrn committed with Eric Wong Jun 9, 2012
  2. git-svn: make Git::SVN::RA a separate file

    This slices off another 600 or so lines from the frighteningly long
    git-svn.perl script.
    
    The Git::SVN::Ra interface is similar enough to SVN::Ra that it is
    probably safe to ignore most of its implementation on first reading.
    (Documenting or moving functions that do not fit that pattern is left
    as an exercise to the interested reader.)
    
    [ew: rebased and fixed conflict against
     commit c26ddce
     (git-svn: platform auth providers are working only on 1.6.15 or newer)]
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    jrn committed with Eric Wong Jun 9, 2012
  3. git-svn: make Git::SVN::Editor a separate file

    This makes the git-svn script shorter and less scary for beginners to
    read through for the first time.  Take the opportunity to explain the
    purpose and basic interface of the Git::SVN::Editor class while at it.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    jrn committed with Eric Wong Jun 9, 2012
Commits on Jun 9, 2012
  1. l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb

     * Translated 28 strings.
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed Jun 9, 2012
Commits on Jun 8, 2012
  1. Merge branch 'mm/api-credentials-doc'

    Finishing touches...
    
    * mm/api-credentials-doc:
      docs: fix cross-directory linkgit references
    gitster committed Jun 8, 2012
  2. docs: fix cross-directory linkgit references

    Most of our documentation is in a single directory, so using
    linkgit:git-config[1] just generates a relative link in the
    same directory. However, this is not the case with the API
    documentation in technical/*, which need to refer to
    git-config from the parent directory.
    
    We can fix this by passing a special prefix attribute when building
    in a subdirectory, and respecting that prefix in our linkgit
    definitions.
    
    We only have to modify the html linkgit definition.  For
    manpages, we can ignore this for two reasons:
    
      1. we do not generate actual links to the file in
         manpages, but instead just give the name and section of
         the linked manpage
    
      2. we do not currently build manpages for subdirectories,
         only html
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jun 7, 2012
  3. l10n: zh_CN.po: translate 27 new messages

    Translate 19 new and 8 fuzzy messages which are marked by shell gettext
    wrappers, and ignored by previous 'git.pot' updates.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Jun 8, 2012
  4. l10n: Update git.pot (27 new, 1 removed messages)

    Extract messages marked by shell gettext wrappers which are ignored
    before. See:
    
     * http://thread.gmane.org/gmane.comp.version-control.git/199112
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Jun 8, 2012
Commits on Jun 7, 2012
  1. Git 1.7.11-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 7, 2012
  2. Merge branch 'mm/api-credentials-doc'

    * mm/api-credentials-doc:
      api-credentials.txt: add "see also" section
      api-credentials.txt: mention credential.helper explicitly
      api-credentials.txt: show the big picture first
      doc: fix xref link from api docs to manual pages
    gitster committed Jun 7, 2012
  3. Merge branch 'rr/maint-t3510-cascade-fix'

    * rr/maint-t3510-cascade-fix:
      t3510 (cherry-pick-sequence): add missing '&&'
    gitster committed Jun 7, 2012
  4. Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'

    Regression fix for people with libsvn between 1.6.12 and 1.6.15, on
    which we tried to use the non-working platform auth providers.
    
    * jc/svn-auth-providers-unusable-at-1.6.12:
      git-svn: platform auth providers are working only on 1.6.15 or newer
    gitster committed Jun 7, 2012
  5. Merge branch 'cr/persistent-https'

    A remote helper that acts as a proxy and caches ssl session for the
    https:// transport is added to the contrib/ area.
    
    By Colby Ranger
    * cr/persistent-https:
      Add persistent-https to contrib
    gitster committed Jun 7, 2012
Commits on Jun 6, 2012
  1. fmt-merge-msg: make attribution into comment lines

    The submaintainer credit is not something you can compute purely by
    looking at the history and its shape, especially in the presense of
    fast-forward merges, and this observation makes the information on
    the "via" line unreliable.  Let's leave the final determination of
    credits up to whoever is making the merge and show them as comments.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 6, 2012
Commits on Jun 5, 2012
  1. Merge git://github.com/git-l10n/git-po

    German and Chinese translation updates.
    
    By Ralf Thielow (4) and others
    via Jiang Xin (1) and Tran Ngoc Quan (1)
    * git://github.com/git-l10n/git-po:
      l10n: Update translation for Vietnamese
      l10n: de.po: add additional newline
      l10n: de.po: translate 2 new, 3 fuzzy messages
      l10n: de.po: translate 41 new messages
      l10n: de.po: translate 265 new messages
      l10n: zh_CN.po: translate 2 new, 3 fuzzy messages
      l10n: Update git.pot (5 new, 3 removed messages)
    gitster committed Jun 5, 2012
Commits on Jun 4, 2012
  1. t3510 (cherry-pick-sequence): add missing '&&'

    Breaks in a test assertion's && chain can potentially hide failures
    from earlier commands in the chain.  Fix an instance of this in the
    setup.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Jun 4, 2012
  2. api-credentials.txt: add "see also" section

    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Jun 4, 2012
  3. api-credentials.txt: mention credential.helper explicitly

    The name of the configuration variable was mentioned only at the very
    end of the explanation, in a place specific to a specific rule, hence it
    was not very clear what the specification was about.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Jun 4, 2012
  4. api-credentials.txt: show the big picture first

    The API documentation targets two kinds of developers: those using the
    C API, and those writing remote-helpers. The document was not clear
    about which part was useful to which category, and for example, the C API
    could be mistakenly thought as an API for writting remote helpers.
    
    Based-on-patch-by: Jeff King <peff@peff.net>
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Jun 4, 2012
  5. doc: fix xref link from api docs to manual pages

    They are one-level above, so refer them as linkgit:../git-foo[n] with "../"
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 4, 2012
  6. git-svn: platform auth providers are working only on 1.6.15 or newer

    Matthijs Kooijman reports that the cut-off point 082afee (git-svn:
    use platform specific auth providers, 2012-04-26) set at 1.6.12 to
    use this feature safely was incorrect, and it is 1.6.15 instead:
    
        http://svn.apache.org/repos/asf/subversion/trunk/CHANGES
        Version 1.6.15
           * improve some swig parameter mapping (r984565, r1035745)
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    gitster committed Jun 4, 2012
  7. Merge git://github.com/ralfth/git-po-de

    By Ralf Thielow
    via Ralf Thielow
    * ralfth/git-po-de/master:
      l10n: de.po: add additional newline
      l10n: de.po: translate 2 new, 3 fuzzy messages
      l10n: de.po: translate 41 new messages
      l10n: de.po: translate 265 new messages
    jiangxin committed Jun 4, 2012
  8. l10n: Update translation for Vietnamese

     * Updated 5 strings for v1.7.11-rc0-100-g5498c
     * Retranslated about 16 strings
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed Jun 2, 2012
Commits on Jun 3, 2012
  1. Git 1.7.11-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 3, 2012
  2. Sync with 1.7.10.4

    * maint:
      Git 1.7.10.4
    gitster committed Jun 3, 2012
  3. Git 1.7.10.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 3, 2012