Permalink
Commits on Jun 18, 2018
  1. l10n: ko.po: Update Korean translation

    changwoo committed Jun 18, 2018
    Update the Korean translation and change the team leader to Gwan-gyeong
    Mun.
    
    Signed-off-by: Gwan-gyeong Mun <elongbug@gmail.com>
    Signed-off-by: Changwoo Ryu <cwryu@debian.org>
    Reviewed-by: Gwan-gyeong Mun <elongbug@gmail.com>
Commits on Jun 17, 2018
  1. l10n: zh_CN: for git v2.18.0 l10n round 1 to 3

    jiangxin committed May 28, 2018
    Translate 251 new messages (3608t0f0u) for git 2.18.0.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
  2. Merge branch 'master' of git://github.com/nafmo/git-l10n-sv

    jiangxin committed Jun 17, 2018
    * 'master' of git://github.com/nafmo/git-l10n-sv:
      l10n: sv.po: Update Swedish translation (3608t0f0u)
      l10n: sv.po: Update Swedish translation (3470t0f0u)
  3. Merge branch 'master' of https://github.com/vnwildman/git

    jiangxin committed Jun 17, 2018
    * 'master' of https://github.com/vnwildman/git:
      l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3
  4. Merge branch 'master' of git://github.com/alshopov/git-po

    jiangxin committed Jun 17, 2018
    * 'master' of git://github.com/alshopov/git-po:
      l10n: bg.po: Updated Bulgarian translation (3608t)
  5. Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/git

    jiangxin committed Jun 17, 2018
    * 'fr_2.18_rnd3' of git://github.com/jnavila/git:
      l10n: fr.po v2.18.0 round 3
  6. l10n: bg.po: Updated Bulgarian translation (3608t)

    alshopov committed Jun 17, 2018
    Signed-off-by: Alexander Shopov <ash@kambanaria.org>
  7. l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3

    vnwildman committed Jun 17, 2018
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Commits on Jun 16, 2018
  1. l10n: fr.po v2.18.0 round 3

    jnavila committed Jun 16, 2018
    Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
  2. l10n: es.po: Spanish update for v2.18.0 round 3

    ChrisADR committed Jun 16, 2018
    Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
  3. l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed)

    jiangxin committed Jun 16, 2018
    Generate po/git.pot from v2.18.0-rc2 for git v2.18.0 l10n round 3.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
  4. Merge branch 'master' of git://github.com/git-l10n/git-po

    jiangxin committed Jun 16, 2018
    * 'master' of git://github.com/git-l10n/git-po:
      l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2
      l10n: bg.po: Updated Bulgarian translation (3608t)
      l10n: es.po: Spanish update for v2.18.0 round 2
      l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed)
      l10n: fr.po v2.18 round 1
      l10n: vi(3470t): Updated Vietnamese translation for v2.18.0
      l10n: es.po: Spanish update for v2.18.0 round 1
      l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed)
      l10n: TEAMS: remove inactive de team members
      l10n: de.po: fix typos
      l10n: Update Catalan translation
Commits on Jun 15, 2018
  1. Merge branch 'master' of https://github.com/vnwildman/git

    jiangxin committed Jun 15, 2018
    * 'master' of https://github.com/vnwildman/git:
      l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2
Commits on Jun 14, 2018
  1. l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2

    vnwildman committed Jun 14, 2018
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Commits on Jun 13, 2018
  1. Git 2.18-rc2

    gitster committed Jun 13, 2018
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jk/index-pack-maint'

    gitster committed Jun 13, 2018
    "index-pack --strict" has been taught to make sure that it runs the
    final object integrity checks after making the freshly indexed
    packfile available to itself.
    
    * jk/index-pack-maint:
      index-pack: correct install_packed_git() args
      index-pack: handle --strict checks of non-repo packs
      prepare_commit_graft: treat non-repository as a noop
  3. Merge branch 'sg/completion-zsh-workaround'

    gitster committed Jun 13, 2018
    Work around zsh segfaulting when loading git-completion.zsh
    
    * sg/completion-zsh-workaround:
      completion: correct zsh detection when run from git-completion.zsh
  4. Merge branch 'sb/submodule-merge-in-merge-recursive'

    gitster committed Jun 13, 2018
    Finishing touches to a topic that already is in 'master'.
    
    * sb/submodule-merge-in-merge-recursive:
      merge-submodule: reduce output verbosity
  5. Merge branch 'jk/submodule-fsck-loose-fixup'

    gitster committed Jun 13, 2018
    Finishing touches to a topic that already is in 'maint'.
    
    * jk/submodule-fsck-loose-fixup:
      fsck: avoid looking at NULL blob->object
      t7415: don't bother creating commit for symlink test
  6. RelNotes 2.18: clarify where directory rename detection applies

    newren authored and gitster committed Jun 12, 2018
    Mention that this feature works with some commands (merge and cherry-pick,
    implying that it also works with commands that build on these like rebase
    -m and rebase -i).  Explicitly mentioning two commands hopefully implies
    that it may not always work with other commands (am, and rebase without
    flags that imply either -m or -i).
    
    Also, since the directory rename detection from this cycle was
    specifically added in merge-recursive and not diffcore-rename, remove the
    'in "diff" family" phrase from the note.  (Folks have requested in the
    past that `git diff` detect directory renames and somehow simplify its
    output, so it may be helpful to avoid implying that diff has any new
    capability here.)
    
    Signed-off-by: Elijah Newren <newren@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 12, 2018
  1. completion: correct zsh detection when run from git-completion.zsh

    szeder authored and gitster committed Jun 11, 2018
    v2.18.0-rc0~90^2 (completion: reduce overhead of clearing cached
    --options, 2018-04-18) worked around a bug in bash's "set" builtin on
    MacOS by using compgen instead.  It was careful to avoid breaking zsh
    by guarding this workaround with
    
    	if [[ -n ${ZSH_VERSION-}} ]]
    
    Alas, this interacts poorly with git-completion.zsh's bash emulation:
    
    	ZSH_VERSION='' . "$script"
    
    Correct it by instead using a new GIT_SOURCING_ZSH_COMPLETION shell
    variable to detect whether git-completion.bash is being sourced from
    git-completion.zsh.  This way, the zsh variant is used both when run
    from zsh directly and when run via git-completion.zsh.
    
    Reproduction recipe:
    
     1. cd git/contrib/completion && cp git-completion.zsh _git
     2. Put the following in a new ~/.zshrc file:
    
     	autoload -U compinit; compinit
    	autoload -U bashcompinit; bashcompinit
    	fpath=(~/src/git/contrib/completion $fpath)
    
     3. Open zsh and "git <TAB>".
    
    With this patch:
    Triggers nice git-completion.bash based tab completion
    
    Without:
     contrib/completion/git-completion.bash:354: read-only variable: QISUFFIX
     zsh:12: command not found: ___main
     zsh:15: _default: function definition file not found
     _dispatch:70: bad math expression: operand expected at `/usr/bin/g...'
     Segmentation fault
    
    Reported-by: Rick van Hattem <wolph@wol.ph>
    Reported-by: Dave Borowitz <dborowitz@google.com>
    Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. l10n: bg.po: Updated Bulgarian translation (3608t)

    alshopov committed Jun 12, 2018
    Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Commits on Jun 11, 2018
  1. index-pack: correct install_packed_git() args

    gitster committed Jun 11, 2018
    The function does not start taking the repository object as a
    parameter before v2.18 track.  Make the topic mergeable to v2.17
    maintenance track by dropping it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. merge-submodule: reduce output verbosity

    leiflm authored and gitster committed Jun 11, 2018
    The output shall behave more similar to ordinary file merges' output to provide
    a more consistent user experience.
    
    Signed-off-by: Leif Middelschulte <Leif.Middelschulte@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. fsck: avoid looking at NULL blob->object

    peff authored and gitster committed Jun 11, 2018
    Commit 159e7b0 (fsck: detect gitmodules files,
    2018-05-02) taught fsck to look at the content of
    .gitmodules files. If the object turns out not to be a blob
    at all, we just complain and punt on checking the content.
    And since this was such an obvious and trivial code path, I
    didn't even bother to add a test.
    
    Except it _does_ do one non-trivial thing, which is call the
    report() function, which wants us to pass a pointer to a
    "struct object". Which we don't have (we have only a "struct
    object_id"). So we erroneously pass a NULL object to
    report(), which gets dereferenced and causes a segfault.
    
    It seems like we could refactor report() to just take the
    object_id itself. But we pass the object pointer along to
    a callback function, and indeed this ends up in
    builtin/fsck.c's objreport() which does want to look at
    other parts of the object (like the type).
    
    So instead, let's just use lookup_unknown_object() to get
    the real "struct object", and pass that.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. t7415: don't bother creating commit for symlink test

    peff authored and gitster committed Jun 11, 2018
    Early versions of the fsck .gitmodules detection code
    actually required a tree to be at the root of a commit for
    it to be checked for .gitmodules. What we ended up with in
    159e7b0 (fsck: detect gitmodules files, 2018-05-02),
    though, finds a .gitmodules file in _any_ tree (see that
    commit for more discussion).
    
    As a result, there's no need to create a commit in our
    tests. Let's drop it in the name of simplicity. And since
    that was the only thing referencing $tree, we can pull our
    tree creation out of a command substitution.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. RelNotes 2.18: typofixes

    gitster committed Jun 11, 2018
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 10, 2018
  1. l10n: es.po: Spanish update for v2.18.0 round 2

    ChrisADR committed Jun 10, 2018
    Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
Commits on Jun 8, 2018
  1. l10n: sv.po: Update Swedish translation (3608t0f0u)

    nafmo committed Jun 8, 2018
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
  2. l10n: sv.po: Update Swedish translation (3470t0f0u)

    nafmo committed Jun 1, 2018
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
  3. l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed)

    jiangxin committed Jun 8, 2018
    Generate po/git.pot from v2.18.0-rc1 for git v2.18.0 l10n round 2.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
  4. Merge branch 'master' of git://github.com/git-l10n/git-po

    jiangxin committed Jun 8, 2018
    * 'master' of git://github.com/git-l10n/git-po:
      l10n: fr.po v2.18 round 1
      l10n: vi(3470t): Updated Vietnamese translation for v2.18.0
      l10n: es.po: Spanish update for v2.18.0 round 1
      l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed)
      l10n: TEAMS: remove inactive de team members
      l10n: de.po: fix typos
      l10n: Update Catalan translation
Commits on Jun 4, 2018
  1. Git 2.18-rc1

    gitster committed Jun 4, 2018
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'bc/t3430-fixup'

    gitster committed Jun 4, 2018
    Test fix.
    
    * bc/t3430-fixup:
      t3430: test clean-up
  3. Merge branch 'bw/refspec-api'

    gitster committed Jun 4, 2018
    Hotfix.
    
    * bw/refspec-api:
      refspec-api: avoid uninitialized field in refspec item