Permalink
Commits on Jun 17, 2012
  1. Git 1.7.11

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

    gitster committed Jun 17, 2012
  3. Git 1.7.10.5

    gitster committed Jun 17, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Do not autosquash in case of an implied interactive rebase

    vfr-nl authored and gitster committed May 24, 2012
    The option to autosquash is only used in case of an interactive rebase.
    When merges are preserved, rebase uses an interactive rebase internally,
    but in this case autosquash should still be disabled.
    
    Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Merge branch 'js/maint-fast-export-mark-error' into maint

    gitster committed Jun 17, 2012
    "git fast-export" did not give a readable error message when the same
    mark erroneously appeared twice in the --import-marks input.
Commits on Jun 15, 2012
  1. Merge git://github.com/git-l10n/git-po

    gitster committed Jun 15, 2012
    Updated Italian translations.
    
    * git://github.com/git-l10n/git-po:
      l10n: it.po: translate 212 new messages
  2. Merge branch 'as/diff-shortstat-ignore-binary'

    gitster committed Jun 15, 2012
    # By Alexander Strasser
    * as/diff-shortstat-ignore-binary:
      diff: Only count lines in show_shortstats
  3. diff: Only count lines in show_shortstats

    beastd authored and gitster committed Jun 15, 2012
    Do not mix byte and line counts. Binary files have byte counts;
    skip them when accumulating line insertions/deletions.
    
    The regression was introduced in e18872b.
    
    Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. perl/Makefile: install Git::SVN::* when NO_PERL_MAKEMAKER=yes, too

    jrn authored and gitster committed Jun 15, 2012
    v1.7.11-rc1~12^2~2 (2012-05-27) and friends split some git-svn code
    into separate modules but did not update the fallback rules to install
    them when NO_PERL_MAKEMAKER is set.  Add the appropriate rules so
    users without MakeMaker can use git-svn again.
    
    Affected modules: Git::SVN::Prompt, Git::SVN::Fetcher,
    Git::SVN::Editor, Git::SVN::Ra, Git::SVN::Memoize::YAML.
    
    Reported-by: Adam Roben <adam@roben.org>
    Signed-off-by: Jonathan Nieder <jrnieder@gmali.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. perl/Makefile.PL: warn about duplicate module list in perl/Makefile

    jrn authored and gitster committed Jun 15, 2012
    Adding or removing a module requires modifying both files to support
    builds with and without MakeMaker.  Add a comment to remind patch
    authors and reviewers at the crucial moment.
    
    Longer term, it would be nicer to maintain a single list, perhaps in a
    separate file used by both build systems.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 14, 2012
  1. l10n: it.po: translate 212 new messages

    mapolone committed Jun 14, 2012
    Signed-off-by: Marco Paolone <marcopaolone@gmail.com>
    Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Commits on Jun 13, 2012
  1. Merge branch 'rj/gitweb-test-sans-date-parser'

    gitster committed Jun 13, 2012
    Regression fix to t9501 introduced at 0f3ddd4
    
    * rj/gitweb-test-sans-date-parser:
      gitweb: Skip 'modification times' tests when no date parser available
  2. Merge branch 'fc/git-complete-helper-fix'

    gitster committed Jun 13, 2012
    * fc/git-complete-helper-fix:
      completion: put main git and gitk completion functions back into git namespace
  3. completion: remove credential helpers from porcelain commands

    szeder authored and gitster committed Jun 13, 2012
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. completion: put main git and gitk completion functions back into git …

    szeder authored and gitster committed Jun 13, 2012
    …namespace
    
    Commit 7f02f3d (completion: rename internal helpers _git and _gitk,
    2012-05-19) renamed said functions to _main_git() and _main_gitk(),
    respectively.  By convention the name of our git-completion-specific
    functions start with '_git' or '__git' prefix, so rename those
    functions once again to put them back into our "namespace".  Use the
    two underscore prefix, because _git_main() could be mistaken for the
    completion function of the (not yet existing) 'git main' command.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 12, 2012
  1. gitweb: Skip 'modification times' tests when no date parser available

    Ramsay Jones authored and gitster committed Jun 12, 2012
    The If-Modified-Since support in Gitweb is conditional on the
    availability of a date parser from either the HTTP::Date or
    Time::ParseDate modules. If a suitable parser is not available,
    then the corresponding 'modification times' tests should be skipped.
    
    Introduce the DATE_PARSER test prerequisite and use it to skip
    all of the dependent tests.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Git 1.7.11-rc3

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

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

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

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

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

    moy authored and gitster committed Jun 11, 2012
    …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>
  8. Merge branch 'js/maint-fast-export-mark-error'

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

    dscho authored and gitster committed Jun 12, 2012
    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>
Commits on Jun 11, 2012
  1. l10n: de.po: translate 27 new messages

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

    jrn authored and Eric Wong committed Jun 9, 2012
    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>
  2. git-svn: make Git::SVN::RA a separate file

    jrn authored and Eric Wong committed Jun 9, 2012
    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>
  3. git-svn: make Git::SVN::Editor a separate file

    jrn authored and Eric Wong committed Jun 9, 2012
    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>
Commits on Jun 9, 2012
  1. l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb

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

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

    peff authored and gitster committed Jun 7, 2012
    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>
  3. l10n: zh_CN.po: translate 27 new messages

    jiangxin committed Jun 8, 2012
    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>
  4. l10n: Update git.pot (27 new, 1 removed messages)

    jiangxin committed Jun 8, 2012
    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>
Commits on Jun 7, 2012
  1. Git 1.7.11-rc2

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

    gitster committed Jun 7, 2012
    * 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