Skip to content
Commits on Jun 24, 2016
  1. @gitster

    Sync with master

    * master:
      git-svn: skip mergeinfo handling with --no-follow-parent
    gitster committed Jun 24, 2016
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
  2. @gitster

    Merge branch 'tb/complete-status' into next

    The completion script (in contrib/) learned to complete "git
    status" options.
    
    * tb/complete-status:
      completion: add git status
      completion: add __git_get_option_value helper
      completion: factor out untracked file modes into a variable
    gitster committed Jun 22, 2016
  3. @gitster

    Merge branch 'mg/cherry-pick-multi-on-unborn' into next

    "git cherry-pick A" worked on an unborn branch, but "git
    cherry-pick A..B" didn't.
    
    * mg/cherry-pick-multi-on-unborn:
      cherry-pick: allow to pick to unborn branches
    gitster committed Jun 22, 2016
  4. @gitster

    Merge branch 'lf/receive-pack-auto-gc-to-client' into next

    Allow messages that are generated by auto gc during "git push" on
    the receiving end to be explicitly passed back to the sending end
    over sideband, so that they are shown with "remote: " prefix to
    avoid confusing the users.
    
    * lf/receive-pack-auto-gc-to-client:
      receive-pack: send auto-gc output over sideband 2
    gitster committed Jun 22, 2016
  5. @gitster

    Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into next

    Comments about misbehaving FreeBSD shells have been clarified with
    the version number (9.x and before are broken, newer ones are OK).
    
    * em/newer-freebsd-shells-are-fine-with-returns:
      rebase: update comment about FreeBSD /bin/sh
    gitster committed Jun 22, 2016
  6. @gitster

    Merge branch 'lv/status-say-working-tree-not-directory' into next

    "git status" used to say "working directory" when it meant "working
    tree".
    
    * lv/status-say-working-tree-not-directory:
      Use "working tree" instead of "working directory" for git status
    gitster committed Jun 22, 2016
  7. @gitster

    Merge branch 'nb/gnome-keyring-build' into next

    Build improvements for gnome-keyring (in contrib/)
    
    * nb/gnome-keyring-build:
      gnome-keyring: Don't hard-code pkg-config executable
    gitster committed Jun 22, 2016
  8. @gitster

    Merge branch 'jc/deref-tag' into next

    Code clean-up.
    
    * jc/deref-tag:
      blame, line-log: do not loop around deref_tag()
    gitster committed Jun 22, 2016
  9. @gitster

    Merge branch 'et/add-chmod-x' into next

    "git update-index --add --chmod=+x file" may be usable as an escape
    hatch, but not a friendly thing to force for people who do need to
    use it regularly.  "git add --chmod=+x file" can be used instead.
    
    * et/add-chmod-x:
      add: add --chmod=+x / --chmod=-x options
    gitster committed Jun 22, 2016
  10. @gitster

    Merge branch 'jk/avoid-unbounded-alloca' into next

    * jk/avoid-unbounded-alloca:
      tree-diff: avoid alloca for large allocations
    gitster committed Jun 22, 2016
  11. @gitster

    Merge branch 'rj/compat-regex-size-max-fix' into next

    A compilation fix.
    
    * rj/compat-regex-size-max-fix:
      regex: fix a SIZE_MAX macro redefinition warning
    gitster committed Jun 22, 2016
  12. @gitster

    Merge branch 'vs/prompt-avoid-unset-variable' into next

    The git-prompt scriptlet (in contrib/) was not friendly with those
    who uses "set -u", which has been fixed.
    
    * vs/prompt-avoid-unset-variable:
      git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
    gitster committed Jun 22, 2016
  13. @gitster

    Merge branch 'sg/reflog-past-root' into next

    "git reflog" stopped upon seeing an entry that denotes a branch
    creation event (aka "unborn"), which made it appear as if the
    reflog was truncated.
    
    * sg/reflog-past-root:
      reflog: continue walking the reflog past root commits
    gitster committed Jun 22, 2016
  14. @gitster

    Merge branch 'pb/strbuf-read-file-doc' into next

    * pb/strbuf-read-file-doc:
      strbuf: describe the return value of strbuf_read_file
    gitster committed Jun 22, 2016
  15. @gitster

    Merge branch 'dn/gpg-doc' into next

    The documentation tries to consistently spell "GPG"; when
    referring to the specific program name, "gpg" is used.
    
    * dn/gpg-doc:
      Documentation: GPG capitalization
    gitster committed Jun 22, 2016
  16. @gitster

    Merge branch 'jk/fetch-prune-doc' into next

    * jk/fetch-prune-doc:
      fetch: document that pruning happens before fetching
    gitster committed Jun 22, 2016
  17. @gitster

    Merge branch 'ap/git-svn-propset-doc' into next

    "git svn propset" subcommand that was added in 2.3 days is
    documented now.
    
    * ap/git-svn-propset-doc:
      git-svn: document the 'git svn propset' command
    gitster committed Jun 22, 2016
  18. @gitster

    Merge branch 'tr/doc-tt' into next

    The documentation set has been updated so that literal commands,
    configuration variables and environment variables are consistently
    typeset in fixed-width font and bold in manpages.
    
    * tr/doc-tt:
      doc: change configuration variables format
      doc: more consistency in environment variables format
      doc: change environment variables format
      doc: clearer rule about formatting literals
    gitster committed Jun 22, 2016
  19. @gitster

    Merge branch 'pc/occurred' into next

    * pc/occurred:
      config.c: fix misspelt "occurred" in an error message
      refs.h: fix misspelt "occurred" in a comment
    gitster committed Jun 22, 2016
Commits on Jun 20, 2016
  1. @gitster

    Merge branch 'cc/apply-introduce-state' into next

    The "git apply" standalone program is being libified; this is the
    first step to move many state variables into a structure that can
    be explicitly (re)initialized to make the machinery callable more
    than once.
    
    The next step that moves some remaining state variables into the
    structure and turns die()s into an error return that propagates up
    to the caller is not queued yet but in flight.  It would be good to
    review the above first and give the remainder of the series a solid
    base to build on.
    
    * cc/apply-introduce-state: (50 commits)
      builtin/apply: remove misleading comment on lock_file field
      builtin/apply: move 'newfd' global into 'struct apply_state'
      builtin/apply: add 'lock_file' pointer into 'struct apply_state'
      builtin/apply: move applying patches into apply_all_patches()
      builtin/apply: move 'state' check into check_apply_state()
      builtin/apply: move 'symlink_changes' global into 'struct apply_state'
      builtin/apply: move 'fn_table' global into 'struct apply_state'
      builtin/apply: move 'state_linenr' global into 'struct apply_state'
      builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'
      builtin/apply: move 'ws_ignore_action' into 'struct apply_state'
      builtin/apply: move 'ws_error_action' into 'struct apply_state'
      builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'
      builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'
      builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()
      builtin/apply: move 'whitespace_option' into 'struct apply_state'
      builtin/apply: move 'whitespace_error' global into 'struct apply_state'
      builtin/apply: move 'root' global into 'struct apply_state'
      builtin/apply: move 'p_value_known' global into 'struct apply_state'
      builtin/apply: move 'p_value' global into 'struct apply_state'
      builtin/apply: move 'has_include' global into 'struct apply_state'
      ...
    gitster committed Jun 20, 2016
  2. @gitster

    Start the post-2.9 cycle

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 20, 2016
  3. @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
  4. @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
  5. @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
  6. @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
  7. @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
  8. @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
  9. @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
  10. @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
  11. @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
  12. @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
  13. @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
  14. @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 17, 2016
  1. @emaste @gitster

    rebase: update comment about FreeBSD /bin/sh

    Commit 9f50d32 introduced a fix for FreeBSD /bin/sh misbehaviour
    when dot-sourcing a file containing "return" statements outside of
    any function, from a function in another shell script. That issue
    affects FreeBSD 9.x, and is not present in the /bin/sh in FreeBSD
    10.3 and later. Update the comment to clarify this.
    
    The example from 9f50d32's commit message produces the expected output
    on FreeBSD 10.3 and -CURRENT (the upcoming 11.0):
    
    % sh script1.sh
    only this line should show
    %
    
    Signed-off-by: Ed Maste <emaste@freebsd.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    emaste committed with gitster Jun 17, 2016
Something went wrong with that request. Please try again.