Skip to content
Commits on Jun 22, 2016
  1. git-svn: skip mergeinfo handling with --no-follow-parent

    For repositories without parent following enabled, finding
    git parents through svn:mergeinfo or svk::parents can be
    expensive and pointless.
    
    Reported-by: Александр Овчинников <proff@proff.email>
    	http://mid.gmane.org/4094761466408188@web24o.yandex.ru
    
    Signed-off-by: Eric Wong <e@80x24.org>
    Eric Wong committed Jun 20, 2016
Commits on Jun 20, 2016
  1. @gitster

    Start the post-2.9 cycle

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

    Merge branch 'rs/xdiff-hunk-with-func-line'

    "git show -W" (extend hunks to cover the entire function, delimited
    by lines that match the "funcname" pattern) used to show the entire
    file when a change added an entire function at the end of the file,
    which has been fixed.
    
    * rs/xdiff-hunk-with-func-line:
      xdiff: fix merging of appended hunk with -W
      grep: -W: don't extend context to trailing empty lines
      t7810: add test for grep -W and trailing empty context lines
      xdiff: don't trim common tail with -W
      xdiff: -W: don't include common trailing empty lines in context
      xdiff: ignore empty lines before added functions with -W
      xdiff: handle appended chunks better with -W
      xdiff: factor out match_func_rec()
      t4051: rewrite, add more tests
    gitster committed Jun 20, 2016
  3. @gitster

    Merge branch 'jk/rev-list-count-with-bitmap'

    "git rev-list --count" whose walk-length is limited with "-n"
    option did not work well with the counting optimized to look at the
    bitmap index.
    
    * jk/rev-list-count-with-bitmap:
      rev-list: disable bitmaps when "-n" is used with listing objects
      rev-list: "adjust" results of "--count --use-bitmap-index -n"
    gitster committed Jun 20, 2016
  4. @gitster

    Merge branch 'wd/userdiff-css'

    Update the funcname definition to support css files.
    
    * wd/userdiff-css:
      userdiff: add built-in pattern for CSS
    gitster committed Jun 20, 2016
  5. @gitster

    Merge branch 'jc/clear-pathspec'

    We usually call a function that clears the contents a data
    structure X without freeing the structure itself clear_X(), and
    call a function that does clear_X() and also frees it free_X().
    free_pathspec() function has been renamed to clear_pathspec()
    to avoid confusion.
    
    * jc/clear-pathspec:
      pathspec: rename free_pathspec() to clear_pathspec()
    gitster committed Jun 20, 2016
  6. @gitster

    Merge branch 'aq/upload-pack-use-parse-options'

    "git upload-pack" command has been updated to use the parse-options
    API.
    
    * aq/upload-pack-use-parse-options:
      upload-pack.c: use parse-options API
    gitster committed Jun 20, 2016
  7. @gitster

    Merge branch 'jg/dash-is-last-branch-in-worktree-add'

    "git worktree add" learned that '-' can be used as a short-hand for
    "@{-1}", the previous branch.
    
    * jg/dash-is-last-branch-in-worktree-add:
      worktree: allow "-" short-hand for @{-1} in add command
    gitster committed Jun 20, 2016
  8. @gitster

    Merge branch 'et/pretty-format-c-auto'

    The commands in `git log` family take %C(auto) in a custom format
    string.  This unconditionally turned the color on, ignoring
    --no-color or with --color=auto when the output is not connected to
    a tty; this was corrected to make the format truly behave as
    "auto".
    
    * et/pretty-format-c-auto:
      format_commit_message: honor `color=auto` for `%C(auto)`
    gitster committed Jun 20, 2016
  9. @gitster

    Merge branch 'sb/submodule-recommend-shallowness'

    An upstream project can make a recommendation to shallowly clone
    some submodules in the .gitmodules file it ships.
    
    * sb/submodule-recommend-shallowness:
      submodule update: learn `--[no-]recommend-shallow` option
      submodule-config: keep shallow recommendation around
    gitster committed Jun 20, 2016
  10. @gitster

    Merge branch 'sb/submodule-misc-cleanups'

    Minor simplification.
    
    * sb/submodule-misc-cleanups:
      submodule update: make use of the existing fetch_in_submodule function
    gitster committed Jun 20, 2016
  11. @gitster

    Merge branch 'ew/daemon-socket-keepalive'

    When "git daemon" is run without --[init-]timeout specified, a
    connection from a client that silently goes offline can hang around
    for a long time, wasting resources.  The socket-level KEEPALIVE has
    been enabled to allow the OS to notice such failed connections.
    
    * ew/daemon-socket-keepalive:
      daemon: enable SO_KEEPALIVE for all sockets
    gitster committed Jun 20, 2016
  12. @gitster

    Merge branch 'ah/no-verify-signature-with-pull-rebase'

    "git pull --rebase --verify-signature" learned to warn the user
    that "--verify-signature" is a no-op when rebasing.
    
    * ah/no-verify-signature-with-pull-rebase:
      pull: warn on --verify-signatures with --rebase
    gitster committed Jun 20, 2016
  13. @gitster

    Merge branch 'ew/fast-import-unpack-limit'

    "git fast-import" learned the same performance trick to avoid
    creating too small a packfile as "git fetch" and "git push" have,
    using *.unpackLimit configuration.
    
    * ew/fast-import-unpack-limit:
      fast-import: invalidate pack_id references after loosening
      fast-import: implement unpack limit
    gitster committed Jun 20, 2016
Commits on Jun 13, 2016
  1. @gitster

    Git 2.9

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

    Merge tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-po

    l10n-2.9.0-rc0
    
    * tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-po:
      l10n: ko.po: Update Korean translation
      l10n: ru.po: update Russian translation
      l10n: de.po: translate 104 new messages
      l10n: zh_CN: review for git v2.9.0 l10n round 1
      l10n: zh_CN: for git v2.9.0 l10n round 1
      l10n: pt_PT: update Portuguese translation
      l10n: pt_PT: update according to git-gui glossary
      l10n: pt_PT: merge git.pot file
      l10n: Updated Bulgarian translation of git (2597t,0f,0u)
      l10n: sv.po: Update Swedish translation (2597t0f0u)
      l10n: fr.po v2.9.0rnd1
      l10n: Updated Vietnamese translation (2597t)
      l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)
      l10n: fr.po Fixed grammar mistake
    gitster committed Jun 12, 2016
Commits on Jun 11, 2016
  1. @changwoo
  2. @jiangxin

    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 Jun 11, 2016
  3. @DJm00n

    l10n: ru.po: update Russian translation

    Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
    DJm00n committed Jun 11, 2016
Commits on Jun 10, 2016
  1. @gitster

    Hopefully the final last-minute update before 2.9 final

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

    Merge branch 'jk/diff-compact-heuristic'

    It turns out that the earlier effort to update the heuristics may
    want to use a bit more time to mature.  Turn it off by default.
    
    * jk/diff-compact-heuristic:
      diff: disable compaction heuristic for now
    gitster committed Jun 10, 2016
  3. @gitster

    Merge branch 'jk/shell-portability'

    test fixes.
    
    * jk/shell-portability:
      t5500 & t7403: lose bash-ism "local"
      test-lib: add in-shell "env" replacement
    gitster committed Jun 10, 2016
  4. @gitster

    Merge branch 'jc/t2300-setup'

    A test fix.
    
    * jc/t2300-setup:
      t2300: run git-sh-setup in an environment that better mimics the real life
    gitster committed Jun 10, 2016
  5. @gitster

    diff: disable compaction heuristic for now

    http://lkml.kernel.org/g/20160610075043.GA13411@sigill.intra.peff.net
    reports that a change to add a new "function" with common ending
    with the existing one at the end of the file is shown like this:
    
        def foo
          do_foo_stuff()
    
       +  common_ending()
       +end
       +
       +def bar
       +  do_bar_stuff()
       +
          common_ending()
        end
    
    when the new heuristic is in use.  In reality, the change is to add
    the blank line before "def bar" and everything below, which is what
    the code without the new heuristic shows.
    
    Disable the heuristics by default, and resurrect the documentation
    for the option and the configuration variables, while clearly
    marking the feature as still experimental.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 10, 2016
  6. @ralfth

    l10n: de.po: translate 104 new messages

    Translate 104 new messages came from git.pot update in f517e50
    (l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    ralfth committed Jun 10, 2016
Commits on Jun 9, 2016
  1. @gitster

    xdiff: fix merging of appended hunk with -W

    When -W is given we search the lines between the end of the current
    context and the next change for a function line.  If there is none then
    we merge those two hunks as they must be part of the same function.
    
    If the next change is an appended chunk we abort the search early in
    get_func_line(), however, because its line number is out of range.  Fix
    that by searching from the end of the pre-image in that case instead.
    
    Reported-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Rene Scharfe <l.s.r@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Jun 9, 2016
  2. @oldsharp @jiangxin

    l10n: zh_CN: review for git v2.9.0 l10n round 1

    Signed-off-by: Ray Chen <oldsharp@gmail.com>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    oldsharp committed with jiangxin Jun 6, 2016
Commits on Jun 6, 2016
  1. @gitster

    Git 2.9-rc2

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

    Sync with 2.8.4

    * maint:
      Git 2.8.4
    gitster committed Jun 6, 2016
  3. @gitster

    Git 2.8.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 6, 2016
  4. @gitster

    Merge branch 'kb/msys2-tty' into maint

    The "are we talking with TTY, doing an interactive session?"
    detection has been updated to work better for "Git for Windows".
    
    * kb/msys2-tty:
      mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
    gitster committed Jun 6, 2016
  5. @gitster

    Merge branch 'da/difftool' into maint

    "git difftool" learned to handle unmerged paths correctly in
    dir-diff mode.
    
    * da/difftool:
      difftool: handle unmerged files in dir-diff mode
      difftool: initialize variables for readability
    gitster committed Jun 6, 2016
  6. @gitster

    Merge branch 'tb/core-eol-fix' into maint

    A couple of bugs around core.autocrlf have been fixed.
    
    * tb/core-eol-fix:
      convert.c: ident + core.autocrlf didn't work
      t0027: test cases for combined attributes
      convert: allow core.autocrlf=input and core.eol=crlf
      t0027: make commit_chk_wrnNNO() reliable
    gitster committed Jun 6, 2016
  7. @gitster

    Merge branch 'ar/diff-args-osx-precompose' into maint

    Many commands normalize command line arguments from NFD to NFC
    variant of UTF-8 on OSX, but commands in the "diff" family did
    not, causing "git diff $path" to complain that no such path is
    known to Git.  They have been taught to do the normalization.
    
    * ar/diff-args-osx-precompose:
      diff: run arguments through precompose_argv
    gitster committed Jun 6, 2016
  8. @gitster

    Merge branch 'sb/submodule-helper-relative-path'

    A bash-ism "local" has been removed from "git submodule" scripted
    Porcelain.
    
    * sb/submodule-helper-relative-path:
      submodule: remove bashism from shell script
    gitster committed Jun 6, 2016
Something went wrong with that request. Please try again.