Permalink
Commits on Jun 18, 2018
  1. Almost 2.18 final

    gitster committed Jun 18, 2018
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'es/make-no-iconv'

    gitster committed Jun 18, 2018
    "make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV
    (i.e. linkage of -lintl, -liconv, etc. that are platform-specific
    tweaks), which has been corrected.
    
    * es/make-no-iconv:
      Makefile: make NO_ICONV really mean "no iconv"
  3. Merge branch 'sg/t7406-chain-fix'

    gitster committed Jun 18, 2018
    Test fix.
    
    * sg/t7406-chain-fix:
      t7406-submodule-update: fix broken &&-chains
  4. Merge branch 'ks/branch-set-upstream'

    gitster committed Jun 18, 2018
    A test title has been reworded to clarify it.
    
    * ks/branch-set-upstream:
      t3200: clarify description of --set-upstream test
  5. Merge branch 'js/rebase-i-root-fix'

    gitster committed Jun 18, 2018
    A regression to "rebase -i --root" introduced during this cycle has
    been fixed.
    
    * js/rebase-i-root-fix:
      rebase --root: fix amending root commit messages
      rebase --root: demonstrate a bug while amending root commit messages
  6. Merge branch 'jk/ewah-bounds-check'

    gitster committed Jun 18, 2018
    The code to read compressed bitmap was not careful to avoid reading
    past the end of the file, which has been corrected.
    
    * jk/ewah-bounds-check:
      ewah: adjust callers of ewah_read_mmap()
      ewah_read_mmap: bounds-check mmap reads
  7. Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git-l10n/git-po

    gitster committed Jun 18, 2018
    l10n for Git 2.18.0 round 3
    
    * tag 'l10n-2.18.0-rnd3' of git://github.com/git-l10n/git-po:
      l10n: zh_CN: for git v2.18.0 l10n round 1 to 3
      l10n: bg.po: Updated Bulgarian translation (3608t)
      l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3
      l10n: fr.po v2.18.0 round 3
      l10n: es.po: Spanish update for v2.18.0 round 3
      l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed)
      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: sv.po: Update Swedish translation (3608t0f0u)
      l10n: sv.po: Update Swedish translation (3470t0f0u)
      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
  8. A bunch of micro-fixes before going 2.18 final

    gitster committed Jun 18, 2018
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. Merge branch 'sb/blame-color'

    gitster committed Jun 18, 2018
    Leakfix.
    
    * sb/blame-color:
      blame: release string_list after use in parse_color_fields()
  10. Merge branch 'mw/doc-merge-enumfix'

    gitster committed Jun 18, 2018
    Fix old merge glitch in Documentation during v2.13-rc0 era.
    
    * mw/doc-merge-enumfix:
      doc: update the order of the syntax `git merge --continue`
  11. Merge branch 'en/rename-directory-detection'

    gitster committed Jun 18, 2018
    Newly added codepath in merge-recursive had potential buffer
    overrun, which has been fixed.
    
    * en/rename-directory-detection:
      merge-recursive: use xstrdup() instead of fixed buffer
  12. Merge branch 'rd/doc-remote-tracking-with-hyphen'

    gitster committed Jun 18, 2018
    Doc update.
    
    * rd/doc-remote-tracking-with-hyphen:
      Use hyphenated "remote-tracking branch" (docs and comments)
  13. Merge branch 'jl/zlib-restore-nul-termination'

    gitster committed Jun 18, 2018
    Make zlib inflate codepath more robust against versions of zlib
    that clobber unused portion of outbuf.
    
    * jl/zlib-restore-nul-termination:
      packfile: correct zlib buffer handling
  14. Merge branch 'ab/cred-netrc-no-autodie'

    gitster committed Jun 18, 2018
    Hotfix for contrib/ stuff broken by this cycle.
    
    * ab/cred-netrc-no-autodie:
      git-credential-netrc: remove use of "autodie"
  15. Merge branch 'km/doc-workflows-typofix'

    gitster committed Jun 18, 2018
    Typofix.
    
    * km/doc-workflows-typofix:
      gitworkflows: fix grammar in 'Merge upwards' rule
  16. Merge branch 'ld/git-p4-updates'

    gitster committed Jun 18, 2018
    "git p4" updates.
    
    * ld/git-p4-updates:
      git-p4: auto-size the block
      git-p4: narrow the scope of exceptions caught when parsing an int
      git-p4: raise exceptions from p4CmdList based on error from p4 server
      git-p4: better error reporting when p4 fails
      git-p4: add option to disable syncing of p4/master with p4
      git-p4: disable-rebase: allow setting this via configuration
      git-p4: add options --commit and --disable-rebase
  17. Merge branch 'rd/diff-options-typofix'

    gitster committed Jun 18, 2018
    Typofix.
    
    * rd/diff-options-typofix:
      diff-options.txt: fix minor typos, font inconsistencies, in docs
  18. Merge branch 'rd/comment-typofix-in-sha1-file'

    gitster committed Jun 18, 2018
    In code comment typofix
    
    * rd/comment-typofix-in-sha1-file:
      sha1-file.c: correct $GITDIR to $GIT_DIR in a comment
  19. RelNotes 2.18: minor fix to entry about dynamically loading completions

    szeder authored and gitster committed Jun 18, 2018
    It was not "newer versions of bash" but newer versions of
    bash-completion that made commit 085e2ee (completion: load
    completion file for external subcommand, 2018-04-29) both necessary
    and possible.
    
    Update the corresponding RelNotes entry accordingly.
    
    Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  20. t7406-submodule-update: fix broken &&-chains

    szeder authored and gitster committed Jun 16, 2018
    Three tests in 't7406-submodule-update' contain broken &&-chains, but
    since they are all in subshells, chain-lint couldn't notice them.
    
    Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  21. rebase --root: fix amending root commit messages

    dscho authored and gitster committed Jun 16, 2018
    The code path that triggered that "BUG" really does not want to run
    without an explicit commit message. In the case where we want to amend a
    commit message, we have an *implicit* commit message, though: the one of
    the commit to amend. Therefore, this code path should not even be
    entered.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  22. rebase --root: demonstrate a bug while amending root commit messages

    tmzullinger authored and gitster committed Jun 15, 2018
    When splitting a repository, running `git rebase -i --root` to reword
    the initial commit, Git dies with
    
    	BUG: sequencer.c:795: root commit without message.
    
    Signed-off-by: Todd Zullinger <tmz@pobox.com>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  23. ewah: adjust callers of ewah_read_mmap()

    peff authored and gitster committed Jun 15, 2018
    The return value of ewah_read_mmap() is now an ssize_t,
    since we could (in theory) process up to 32GB of data. This
    would never happen in practice, but a corrupt or malicious
    .bitmap or index file could convince us to do so.
    
    Let's make sure that we don't stuff the value into an int,
    which would cause us to incorrectly move our pointer
    forward.  We'd always move too little, since negative values
    are used for reporting errors. So the worst case is just
    that we end up reporting a corrupt file, not an
    out-of-bounds read.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  24. ewah_read_mmap: bounds-check mmap reads

    peff authored and gitster committed Jun 15, 2018
    The on-disk ewah format tells us how big the ewah data is,
    and we blindly read that much from the buffer without
    considering whether the mmap'd data is long enough, which
    can lead to out-of-bound reads.
    
    Let's make sure we have data available before reading it,
    both for the ewah header/footer as well as for the bit data
    itself. In particular:
    
      - keep our ptr/len pair in sync as we move through the
        buffer, and check it before each read
    
      - check the size for integer overflow (this should be
        impossible on 64-bit, as the size is given as a 32-bit
        count of 8-byte words, but is possible on a 32-bit
        system)
    
      - return the number of bytes read as an ssize_t instead of
        an int, again to prevent integer overflow
    
      - compute the return value using a pointer difference;
        this should yield the same result as the existing code,
        but makes it more obvious that we got our computations
        right
    
    The included test is far from comprehensive, as it just
    picks a static point at which to truncate the generated
    bitmap. But in practice this will hit in the middle of an
    ewah and make sure we're at least exercising this code.
    
    Reported-by: Luat Nguyen <root@l4w.io>
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  25. t3200: clarify description of --set-upstream test

    sivaraam authored and gitster committed Jun 17, 2018
    Support for the --set-upstream option was removed in 5266884
    (builtin/branch: stop supporting the "--set-upstream" option,
    2017-08-17). The change did not completely remove the command
    due to an issue noted in the commit's log message.
    
    So, a test was added to ensure that a command which uses the
    '--set-upstream' option fails instead of silently acting as an alias
    for the '--set-upstream-to' option due to option parsing features.
    
    To avoid confusion, clarify that the option is disabled intentionally
    in the corresponding test description.
    
    The test is expected to be around as long as we intentionally fail
    on seeing the '--set-upstream' option which in turn we expect to
    do for a period of time after which we can be sure that existing
    users of '--set-upstream' are aware that the option is no
    longer supported.
    
    Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.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>