Permalink
Commits on Sep 11, 2016
  1. l10n: zh_CN: review for git v2.10.0 l10n

    Signed-off-by: Ray Chen <oldsharp@gmail.com>
    oldsharp committed with jiangxin Sep 7, 2016
  2. l10n: zh_CN: fixed some typos for git 2.10.0

    Reviewed-by: Ray <tvvocold@163.com>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Sep 5, 2016
Commits on Sep 3, 2016
  1. l10n: pt_PT: update Portuguese repository info

    Change Portuguese l10n leadership to Vasco Almeida.
    
    Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
    vascool committed Sep 3, 2016
  2. l10n: pt_PT: update Portuguese translation

    Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
    vascool committed Sep 3, 2016
Commits on Sep 2, 2016
  1. Merge branch 'master' of https://github.com/vnwildman/git

    * 'master' of https://github.com/vnwildman/git:
      l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)
    jiangxin committed Sep 2, 2016
Commits on Aug 31, 2016
  1. A few more fixes before the final 2.10

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 31, 2016
  2. Merge tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-po

    l10n-2.10.0-rnd2
    
    * tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-po:
      l10n: zh_CN: for git v2.10.0 l10n round 2
      l10n: ca.po: update translation
      l10n: fr.po v2.10.0-rc2
      l10n: sv.po: Update Swedish translation (2757t0f0u)
      l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)
      l10n: Updated Vietnamese translation for v2.10.0 (2789t)
      l10n: pt_PT: update Portuguese translation
      l10n: pt_PT: merge git.pot
      l10n: ko.po: Update Korean translation
      l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)
    gitster committed Aug 31, 2016
  3. Merge branch 'ls/packet-line-protocol-doc-fix'

    Correct an age-old calco (is that a typo-like word for calc)
    in the documentation.
    
    * ls/packet-line-protocol-doc-fix:
      pack-protocol: fix maximum pkt-line size
    gitster committed Aug 31, 2016
  4. Merge branch 'mh/blame-worktree'

    * mh/blame-worktree:
      blame: fix segfault on untracked files
    gitster committed Aug 31, 2016
  5. Merge branch 'kw/patch-ids-optim'

    * kw/patch-ids-optim:
      p3400: make test script executable
    gitster committed Aug 31, 2016
Commits on Aug 30, 2016
  1. pack-protocol: fix maximum pkt-line size

    According to LARGE_PACKET_MAX in pkt-line.h the maximal length of a
    pkt-line packet is 65520 bytes. The pkt-line header takes 4 bytes and
    therefore the pkt-line data component must not exceed 65516 bytes.
    
    Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    larsxschneider committed with gitster Aug 29, 2016
  2. l10n: zh_CN: for git v2.10.0 l10n round 2

    Update 215 translations (2757t0f0u) for git v2.10.0-rc2.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Aug 28, 2016
Commits on Aug 29, 2016
  1. p3400: make test script executable

    Signed-off-by: Rene Scharfe <l.s.r@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Aug 28, 2016
  2. blame: fix segfault on untracked files

    Since 3b75ee9 ("blame: allow to blame paths freshly added to the index",
    2016-07-16) git blame also looks at the index to determine if there is a
    file that was freshly added to the index.
    
    cache_name_pos returns -pos - 1 in case there is no match is found, or
    if the name matches, but the entry has a stage other than 0.  As git
    blame should work for unmerged files, it uses strcmp to determine
    whether the name of the returned position matches, in which case the
    file exists, but is merely unmerged, or if the file actually doesn't
    exist in the index.
    
    If the repository is empty, or if the file would lexicographically be
    sorted as the last file in the repository, -cache_name_pos - 1 is
    outside of the length of the active_cache array, causing git blame to
    segfault.  Guard against that, and die() normally to restore the old
    behaviour.
    
    Reported-by: Simon Ruderich <simon@ruderich.org>
    Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    tgummerer committed with gitster Aug 27, 2016
Commits on Aug 28, 2016
  1. l10n: ca.po: update translation

    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    alexhenrie committed Aug 28, 2016
  2. l10n: fr.po v2.10.0-rc2

    Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
    jnavila committed Aug 20, 2016
  3. l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed Aug 28, 2016
Commits on Aug 27, 2016
  1. l10n: sv.po: Update Swedish translation (2757t0f0u)

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    nafmo committed Aug 26, 2016
  2. Merge branch 'master' of https://github.com/vnwildman/git

    * 'master' of https://github.com/vnwildman/git:
      l10n: Updated Vietnamese translation for v2.10.0 (2789t)
    jiangxin committed Aug 27, 2016
  3. l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)

    Generate po/git.pot from v2.10.0-rc2 for git v2.10.0 l10n round 2.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Aug 27, 2016
  4. Merge branch 'master' of git://github.com/git-l10n/git-po

    * 'master' of git://github.com/git-l10n/git-po:
      l10n: pt_PT: update Portuguese translation
      l10n: pt_PT: merge git.pot
      l10n: ko.po: Update Korean translation
      l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)
    jiangxin committed Aug 27, 2016
  5. l10n: Updated Vietnamese translation for v2.10.0 (2789t)

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed Aug 27, 2016
Commits on Aug 26, 2016
  1. Git 2.10-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 26, 2016
  2. gitattributes: Document the unified "auto" handling

    Update the documentation about text=auto:
    text=auto now follows the core.autocrlf handling when files are not
    normalized in the repository.
    
    For a cross platform project recommend the usage of attributes for
    line-ending conversions.
    
    Signed-off-by: Torsten Bögershausen <tboegi@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    tboegi committed with gitster Aug 26, 2016
Commits on Aug 25, 2016
  1. Prepare for 2.10.0-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 25, 2016
  2. Merge branch 'ja/i18n'

    The recent i18n patch we added during this cycle did a bit too much
    refactoring of the messages to avoid word-legos; the repetition has
    been reduced to help translators.
    
    * ja/i18n:
      i18n: simplify numeric error reporting
      i18n: fix git rebase interactive commit messages
      i18n: fix typos for translation
    gitster committed Aug 25, 2016
  3. Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'

    The tempfile (hence its user lockfile) API lets the caller to open
    a file descriptor to a temporary file, write into it and then
    finalize it by first closing the filehandle and then either
    removing or renaming the temporary file.  When the process spawns a
    subprocess after obtaining the file descriptor, and if the
    subprocess has not exited when the attempt to remove or rename is
    made, the last step fails on Windows, because the subprocess has
    the file descriptor still open.  Open tempfile with O_CLOEXEC flag
    to avoid this (on Windows, this is mapped to O_NOINHERIT).
    
    * bw/mingw-avoid-inheriting-fd-to-lockfile:
      mingw: ensure temporary file handles are not inherited by child processes
      t6026-merge-attr: child processes must not inherit index.lock handles
    gitster committed Aug 25, 2016
  4. Merge branch 'dg/document-git-c-in-git-config-doc'

    The "git -c var[=val] cmd" facility to append a configuration
    variable definition at the end of the search order was described in
    git(1) manual page, but not in git-config(1), which was more likely
    place for people to look for when they ask "can I make a one-shot
    override, and if so how?"
    
    * dg/document-git-c-in-git-config-doc:
      doc: mention `git -c` in git-config(1)
    gitster committed Aug 25, 2016
  5. Merge branch 'js/no-html-bypass-on-windows'

    On Windows, help.browser configuration variable used to be ignored,
    which has been corrected.
    
    * js/no-html-bypass-on-windows:
      Revert "display HTML in default browser using Windows' shell API"
    gitster committed Aug 25, 2016
  6. Merge branch 'hv/doc-commit-reference-style'

    A small doc update.
    
    * hv/doc-commit-reference-style:
      SubmittingPatches: document how to reference previous commits
    gitster committed Aug 25, 2016
  7. git ls-files: text=auto eol=lf is supported in Git 2.10

    The man page for `git ls-files --eol` mentions the combination
    of text attributes "text=auto eol=lf" or "text=auto eol=crlf" as not
    supported yet, but may be in the future.
    
    Now they are supported.
    
    Signed-off-by: Torsten Bögershausen <tboegi@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    tboegi committed with gitster Aug 25, 2016
  8. l10n: pt_PT: update Portuguese translation

    Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
    vascool committed Aug 22, 2016
  9. l10n: pt_PT: merge git.pot

    Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
    vascool committed Aug 16, 2016
Commits on Aug 24, 2016
  1. i18n: simplify numeric error reporting

    Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnavila committed with gitster Aug 21, 2016
  2. i18n: fix git rebase interactive commit messages

    For proper i18n, the logic cannot embed english specific processing.
    
    Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnavila committed with gitster Aug 21, 2016