Permalink
Commits on Aug 30, 2016
  1. @jiangxin

    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 28, 2016
  1. @alexhenrie

    l10n: ca.po: update translation

    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    alexhenrie committed Aug 28, 2016
  2. @jnavila

    l10n: fr.po v2.10.0-rc2

    Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
    jnavila committed Aug 20, 2016
Commits on Aug 27, 2016
  1. @nafmo

    l10n: sv.po: Update Swedish translation (2757t0f0u)

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    nafmo committed Aug 26, 2016
  2. @jiangxin

    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. @jiangxin

    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. @jiangxin

    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. @vnwildman

    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. @gitster

    Git 2.10-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 26, 2016
  2. @tboegi @gitster

    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. @gitster

    Prepare for 2.10.0-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 25, 2016
  2. @gitster

    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. @gitster

    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. @gitster

    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. @gitster

    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. @gitster

    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. @tboegi @gitster

    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. @vascool

    l10n: pt_PT: update Portuguese translation

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

    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. @jnavila @gitster

    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. @jnavila @gitster

    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
  3. @jnavila @gitster

    i18n: fix typos for translation

    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
Commits on Aug 23, 2016
  1. @glasser @gitster

    doc: mention `git -c` in git-config(1)

    Signed-off-by: David Glasser <glasser@davidglasser.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    glasser committed with gitster Aug 23, 2016
  2. @bwijen @gitster

    mingw: ensure temporary file handles are not inherited by child proce…

    …sses
    
    When the index is locked and child processes inherit the handle to
    said lock and the parent process wants to remove the lock before the
    child process exits, on Windows there is a problem: it won't work
    because files cannot be deleted if a process holds a handle on them.
    The symptom:
    
        Rename from 'xxx/.git/index.lock' to 'xxx/.git/index' failed.
        Should I try again? (y/n)
    
    Spawning child processes with bInheritHandles==FALSE would not work
    because no file handles would be inherited, not even the hStdXxx
    handles in STARTUPINFO (stdin/stdout/stderr).
    
    Opening every file with O_NOINHERIT does not work, either, as e.g.
    git-upload-pack expects inherited file handles.
    
    This leaves us with the only way out: creating temp files with the
    O_NOINHERIT flag. This flag is Windows-specific, however. For our
    purposes, it is equivalent to O_CLOEXEC (which does not exist on
    Windows), so let's just open temporary files with the O_CLOEXEC flag and
    map that flag to O_NOINHERIT on Windows.
    
    As Eric Wong pointed out, we need to be careful to handle the case where
    the Linux headers used to compile Git support O_CLOEXEC but the Linux
    kernel used to run Git does not: it returns an EINVAL.
    
    This fixes the test that we just introduced to demonstrate the problem.
    
    Signed-off-by: Ben Wijen <ben@wijen.net>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bwijen committed with gitster Aug 22, 2016
Commits on Aug 21, 2016
  1. @changwoo

    l10n: ko.po: Update Korean translation

    Signed-off-by: Changwoo Ryu <cwryu@debian.org>
    changwoo committed Aug 21, 2016
Commits on Aug 19, 2016
  1. @gitster

    Git 2.10-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 19, 2016
  2. @gitster

    Merge branch 'lt/gpg-show-long-key-in-signature-verification'

    "git log --show-signature" and other commands that display the
    verification status of PGP signature now shows the longer key-id,
    as 32-bit key-id is so last century.
    
    * lt/gpg-show-long-key-in-signature-verification:
      gpg-interface: prefer "long" key format output when verifying pgp signatures
    gitster committed Aug 19, 2016
  3. @gitster

    Merge branch 'ab/hooks'

    "git rev-parse --git-path hooks/<hook>" learned to take
    core.hooksPath configuration variable (introduced during 2.9 cycle)
    into account.
    
    * ab/hooks:
      rev-parse: respect core.hooksPath in --git-path
    gitster committed Aug 19, 2016
  4. @gitster

    Merge branch 'jk/difftool-command-not-found'

    "git difftool" by default ignores the error exit from the backend
    commands it spawns, because often they signal that they found
    differences by exiting with a non-zero status code just like "diff"
    does; the exit status codes 126 and above however are special in
    that they are used to signal that the command is not executable,
    does not exist, or killed by a signal.  "git difftool" has been
    taught to notice these exit status codes.
    
    * jk/difftool-command-not-found:
      difftool: always honor fatal error exit codes
    gitster committed Aug 19, 2016
  5. @gitster

    Merge branch 'sb/checkout-explit-detach-no-advice'

    "git checkout --detach <branch>" used to give the same advice
    message as that is issued when "git checkout <tag>" (or anything
    that is not a branch name) is given, but asking with "--detach" is
    an explicit enough sign that the user knows what is going on.  The
    advice message has been squelched in this case.
    
    * sb/checkout-explit-detach-no-advice:
      checkout: do not mention detach advice for explicit --detach option
    gitster committed Aug 19, 2016
  6. @gitster

    Merge branch 'tb/t0027-raciness-fix'

    The t0027 test for CRLF conversion was timing dependent and flaky.
    
    * tb/t0027-raciness-fix:
      convert: Correct NNO tests and missing `LF will be replaced by CRLF`
    gitster committed Aug 19, 2016
  7. @gitster

    Merge branch 'rs/pull-signed-tag'

    When "git merge-recursive" works on history with many criss-cross
    merges in "verbose" mode, the names the command assigns to the
    virtual merge bases could have overwritten each other by unintended
    reuse of the same piece of memory.
    
    * rs/pull-signed-tag:
      commit: use FLEX_ARRAY in struct merge_remote_desc
      merge-recursive: fix verbose output for multiple base trees
      commit: factor out set_merge_remote_desc()
      commit: use xstrdup() in get_merge_parent()
    gitster committed Aug 19, 2016
  8. @dscho @gitster

    Revert "display HTML in default browser using Windows' shell API"

    Since 4804aab (help (Windows): Display HTML in default browser using
    Windows' shell API, 2008-07-13), Git for Windows used to call
    `ShellExecute()` to launch the default Windows handler for `.html`
    files.
    
    The idea was to avoid going through a shell script, for performance
    reasons.
    
    However, this change ignores the `help.browser` config setting. Together
    with browsing help not being a performance-critical operation, let's
    just revert that patch.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Aug 19, 2016
Commits on Aug 18, 2016
  1. @bwijen @gitster

    t6026-merge-attr: child processes must not inherit index.lock handles

    On Windows, a file cannot be removed unless all file handles to it have
    been released. Hence it is particularly important to close handles when
    spawning children (which would probably not even know that they hold on
    to those handles).
    
    The example chosen for this test is a custom merge driver that indeed
    has no idea that it blocks the deletion of index.lock. The full use case
    is a daemon that lives on after the merge, with subsequent invocations
    handing off to the daemon, thereby avoiding hefty start-up costs. We
    simulate this behavior by simply sleeping one second.
    
    Note that the test only fails on Windows, due to the file locking issue.
    Since we have no way to say "expect failure with MINGW, success
    otherwise", we simply skip this test on Windows for now.
    
    Signed-off-by: Ben Wijen <ben@wijen.net>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bwijen committed with gitster Aug 18, 2016
Commits on Aug 17, 2016
  1. @gitster