Permalink
Commits on Nov 29, 2016
  1. Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru

    * 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
      l10n: ru.po: update Russian translation
    jiangxin committed Nov 29, 2016
  2. l10n: ru.po: update Russian translation

    Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
    DJm00n committed Nov 29, 2016
  3. l10n: ca.po: update translation

    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    alexhenrie committed Nov 29, 2016
Commits on Nov 28, 2016
  1. l10n: de.po: translate 210 new messages

    Translate 210 new messages came from git.pot update in fda7b09
    (l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)) and c091ffb
    (l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    ralfth committed Nov 2, 2016
Commits on Nov 25, 2016
  1. l10n: fix unmatched single quote in error message

    Translate one message introduced by commit:
    
     * 3587180 i18n: fix unmatched single quote in error message
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Nov 20, 2016
Commits on Nov 23, 2016
  1. Git 2.11-rc3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 23, 2016
  2. Merge branch 'jc/setup-cleanup-fix'

    "git archive" and "git mailinfo" stopped reading from local
    configuration file with a recent update.
    
    * jc/setup-cleanup-fix:
      archive: read local configuration
      mailinfo: read local configuration
    gitster committed Nov 23, 2016
  3. Merge branch 'jt/trailer-with-cruft'

    Doc update.
    
    * jt/trailer-with-cruft:
      doc: mention user-configured trailers
    gitster committed Nov 23, 2016
  4. Merge branch 'js/rebase-i-commentchar-fix'

    "git rebase -i" did not work well with core.commentchar
    configuration variable for two reasons, both of which have been
    fixed.
    
    * js/rebase-i-commentchar-fix:
      rebase -i: handle core.commentChar=auto
      stripspace: respect repository config
      rebase -i: highlight problems with core.commentchar
    gitster committed Nov 23, 2016
  5. Merge branch 'jc/for-each-ref-head-segfault-fix'

    Using a %(HEAD) placeholder in "for-each-ref --format=" option
    caused the command to segfault when on an unborn branch.
    
    * jc/for-each-ref-head-segfault-fix:
      for-each-ref: do not segv with %(HEAD) on an unborn branch
    gitster committed Nov 23, 2016
Commits on Nov 22, 2016
  1. Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po

    l10n-2.11.0-rnd2
    
    * tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po:
      l10n: Fixed typo of git fetch-pack command
      l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)
      l10n: zh_CN: for git v2.11.0 l10n round 1
      l10n: pt_PT: update Portuguese translation
      l10n: fr.po fix grammar mistakes
      l10n: fr.po v2.11.0_rnd1
      l10n: sv.po: Update Swedish translation (2913t0f0u)
      l10n: vi.po: Updated translation to v2.11.0 (2913t)
      l10n: ko.po: Update Korean translation
      l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)
      l10n: ru.po: update Russian translation
    gitster committed Nov 22, 2016
  2. Merge branch 'js/prepare-sequencer'

    Fix for an error message string.
    
    * js/prepare-sequencer:
      i18n: fix unmatched single quote in error message
    gitster committed Nov 22, 2016
  3. archive: read local configuration

    Since b9605bc ("config: only read .git/config from configured
    repos", 2016-09-12), we do not read from ".git/config" unless we
    know we are in a repository.  "git archive" however didn't do the
    repository discovery and instead relied on the old behaviour.
    
    Teach the command to run a "gentle" version of repository discovery
    so that local configuration variables are honoured.
    
    [jc: stole tests from peff]
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 22, 2016
  4. mailinfo: read local configuration

    Since b9605bc ("config: only read .git/config from configured
    repos", 2016-09-12), we do not read from ".git/config" unless we
    know we are in a repository.  "git mailinfo" however didn't do the
    repository discovery and instead relied on the old behaviour.  This
    was mostly OK because it was merely run as a helper program by other
    porcelain scripts that first chdir's up to the root of the working
    tree.
    
    Teach the command to run a "gentle" version of repository discovery
    so that local configuration variables like mailinfo.scissors are
    honoured.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 22, 2016
  5. l10n: Fixed typo of git fetch-pack command

    Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed
    the affected translations all in one batch.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Nov 22, 2016
  6. l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)

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

    * 'master' of git://github.com/git-l10n/git-po:
      l10n: zh_CN: for git v2.11.0 l10n round 1
      l10n: pt_PT: update Portuguese translation
      l10n: fr.po fix grammar mistakes
      l10n: fr.po v2.11.0_rnd1
      l10n: sv.po: Update Swedish translation (2913t0f0u)
      l10n: vi.po: Updated translation to v2.11.0 (2913t)
      l10n: ko.po: Update Korean translation
      l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)
      l10n: ru.po: update Russian translation
    jiangxin committed Nov 22, 2016
Commits on Nov 21, 2016
  1. doc: mention user-configured trailers

    In commit 1462450 ("trailer: allow non-trailers in trailer block",
    2016-10-21), functionality was added (and tested [1]) to allow
    non-trailer lines in trailer blocks, as long as those blocks contain at
    least one Git-generated or user-configured trailer, and consists of at
    least 25% trailers. The documentation was updated to mention this new
    functionality, but did not mention "user-configured trailer".
    
    Further update the documentation to also mention "user-configured
    trailer".
    
    [1] "with non-trailer lines mixed with a configured trailer" in
    t/t7513-interpret-trailers.sh
    
    Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Jonathan Tan committed with gitster Nov 21, 2016
  2. rebase -i: handle core.commentChar=auto

    When 84c9dc2 (commit: allow core.commentChar=auto for character auto
    selection, 2014-05-17) extended the core.commentChar functionality to
    allow for the value 'auto', it forgot that rebase -i was already taught to
    handle core.commentChar, and in turn forgot to let rebase -i handle that
    new value gracefully.
    
    Reported by Taufiq Hoven.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Nov 21, 2016
  3. stripspace: respect repository config

    The way "git stripspace" reads the configuration was not quite
    kosher, in that the code forgot to probe for a possibly existing
    repository (note: stripspace is designed to be usable outside the
    repository as well).  It read .git/config only when it was run from
    the top-level of the working tree by accident.  A recent change
    b9605bc ("config: only read .git/config from configured repos",
    2016-09-12) stopped reading the repository-local configuration file
    ".git/config" unless the repository discovery process is done, so
    that .git/config is never read even when run from the top-level,
    exposing the old bug more.
    
    When rebasing interactively with a commentChar defined in the
    current repository's config, the help text at the bottom of the edit
    script potentially used an incorrect comment character. This was not
    only funny-looking, but also resulted in tons of warnings like this
    one:
    
    	Warning: the command isn't recognized in the following line
    	 - #
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Nov 21, 2016
  4. rebase -i: highlight problems with core.commentchar

    The interactive rebase does not currently play well with
    core.commentchar. Let's add some tests to highlight those problems
    that will be fixed in the remainder of the series.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Nov 21, 2016
  5. i18n: fix unmatched single quote in error message

    Fixed unmatched single quote introduced by commit:
    
     * f56fffe sequencer: teach write_message() to append an optional LF
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jiangxin committed with gitster Nov 20, 2016
  6. l10n: zh_CN: for git v2.11.0 l10n round 1

    Update 209 translations (2913t0f0u) for git v2.11.0-rc0.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Oct 27, 2016
Commits on Nov 18, 2016
  1. for-each-ref: do not segv with %(HEAD) on an unborn branch

    The code to flip between "*" and " " prefixes depending on what
    branch is checked out used in --format='%(HEAD)' did not consider
    that HEAD may resolve to an unborn branch and dereferenced a NULL.
    
    This will become a lot easier to trigger as the codepath will be
    used to reimplement "git branch [--list]" in the future.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 18, 2016
Commits on Nov 17, 2016
  1. Git 2.11-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 17, 2016
  2. Merge branch 'tk/diffcore-delta-remove-unused'

    Code cleanup.
    
    * tk/diffcore-delta-remove-unused:
      diffcore-delta: remove unused parameter to diffcore_count_changes()
    gitster committed Nov 17, 2016
  3. Merge branch 'jk/create-branch-remove-unused-param'

    Code clean-up.
    
    * jk/create-branch-remove-unused-param:
      create_branch: drop unused "head" parameter
    gitster committed Nov 17, 2016
  4. Merge branch 'nd/worktree-lock'

    Typofix.
    
    * nd/worktree-lock:
      git-worktree.txt: fix typo "to"/"two", and add comma
    gitster committed Nov 17, 2016
Commits on Nov 14, 2016
  1. diffcore-delta: remove unused parameter to diffcore_count_changes()

    The delta_limit parameter to diffcore_count_changes() has been unused
    since commit ba23bbc ("diffcore-delta: make change counter to byte
    oriented again.", 2006-03-04).
    
    Remove the parameter and adjust all callers.
    
    Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    tklauser committed with gitster Nov 14, 2016
  2. git-worktree.txt: fix typo "to"/"two", and add comma

    Signed-off-by: Ben North <ben@redfrontdoor.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bennorth committed with gitster Nov 12, 2016
Commits on Nov 13, 2016
  1. l10n: pt_PT: update Portuguese translation

    Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
    vascool committed Nov 6, 2016
Commits on Nov 11, 2016
  1. Git 2.11.0-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 11, 2016
  2. Merge branch 'rt/fetch-pack-error-message-fix'

    An error message in fetch-pack executable that was newly marked for
    translation was misspelt, which has been fixed.
    
    * rt/fetch-pack-error-message-fix:
      fetch-pack.c: correct command at the beginning of an error message
    gitster committed Nov 11, 2016
  3. Merge branch 'ps/common-info-doc'

    Doc fix.
    
    * ps/common-info-doc:
      doc: fix location of 'info/' with $GIT_COMMON_DIR
    gitster committed Nov 11, 2016
  4. Merge branch 'js/pwd-var-vs-pwd-cmd-fix'

    Last minute fixes to two fixups merged to 'master' recently.
    
    * js/pwd-var-vs-pwd-cmd-fix:
      t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables
    gitster committed Nov 11, 2016