Permalink
Commits on Dec 5, 2016
  1. Merge branch 'jc/latin-1' into next

    Some platforms no longer understand "latin-1" that is still seen in
    the wild in e-mail headers; replace them with "iso-8859-1" that is
    more widely known when conversion fails from/to it.
    
    * jc/latin-1:
      utf8: accept "latin-1" as ISO-8859-1
      utf8: refactor code to decide fallback encoding
    gitster committed Dec 5, 2016
  2. Merge branch 'sb/submodule-config-cleanup' into next

    Minor code clean-up.
    
    * sb/submodule-config-cleanup:
      submodule-config: clarify parsing of null_sha1 element
      submodule-config: rename commit_sha1 to treeish_name
      submodule config: inline config_from_{name, path}
    gitster committed Dec 5, 2016
  3. Merge branch 'jc/compression-config' into next

    Compression setting for producing packfiles were spread across
    three codepaths, one of which did not honor any configuration.
    Unify these so that all of them honor core.compression and
    pack.compression variables the same way.
    
    * jc/compression-config:
      compression: unify pack.compression configuration parsing
    gitster committed Dec 5, 2016
  4. Merge branch 'dt/smart-http-detect-server-going-away' into next

    When the http server gives an incomplete response to a smart-http
    rpc call, it could lead to client waiting for a full response that
    will never come.  Teach the client side to notice this condition
    and abort the transfer.
    
    An improvement counterproposal has failed.
    cf. <20161114194049.mktpsvgdhex2f4zv@sigill.intra.peff.net>
    
    * dt/smart-http-detect-server-going-away:
      upload-pack: optionally allow fetching any sha1
      remote-curl: don't hang when a server dies before any output
    gitster committed Dec 5, 2016
  5. Merge branch 'hv/submodule-not-yet-pushed-fix' into next

    The code in "git push" to compute if any commit being pushed in the
    superproject binds a commit in a submodule that hasn't been pushed
    out was overly inefficient, making it unusable even for a small
    project that does not have any submodule but have a reasonable
    number of refs.
    
    * hv/submodule-not-yet-pushed-fix:
      submodule_needs_pushing(): explain the behaviour when we cannot answer
      batch check whether submodule needs pushing into one call
      serialize collection of refs that contain submodule changes
      serialize collection of changed submodules
    gitster committed Dec 5, 2016
  6. Merge branch 'mm/gc-safety-doc' into next

    Doc update.
    
    * mm/gc-safety-doc:
      git-gc.txt: expand discussion of races with other processes
    gitster committed Dec 5, 2016
  7. Merge branch 'mm/push-social-engineering-attack-doc' into next

    Doc update on fetching and pushing.
    
    * mm/push-social-engineering-attack-doc:
      doc: mention transfer data leaks in more places
    gitster committed Dec 5, 2016
  8. Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into next

    Code cleanup to avoid using redundant refspecs while fetching with
    the --tags option.
    
    * jt/fetch-no-redundant-tag-fetch-map:
      fetch: do not redundantly calculate tag refmap
    gitster committed Dec 5, 2016
  9. Merge branch 'jc/push-default-explicit' into next

    A lazy "git push" without refspec did not internally use a fully
    specified refspec to perform 'current', 'simple', or 'upstream'
    push, causing unnecessary "ambiguous ref" errors.
    
    * jc/push-default-explicit:
      push: test pushing ambiguously named branches
      push: do not use potentially ambiguous default refspec
    gitster committed Dec 5, 2016
  10. Merge branch 'jk/no-looking-at-dotgit-outside-repo-final' into next

    This is the endgame of the topic to avoid blindly falling back to
    ".git" when the setup sequence said we are _not_ in Git repository.
    A corner case that happens to work right now may be broken by a
    call to die("BUG").
    
    * jk/no-looking-at-dotgit-outside-repo-final:
      setup_git_env: avoid blind fall-back to ".git"
    gitster committed Dec 5, 2016
  11. Merge branch 'jc/merge-drop-old-syntax' into next

    Stop supporting "git merge <message> HEAD <commit>" syntax that has
    been deprecated since October 2007, and issues a deprecation
    warning message since v2.5.0.
    
    * jc/merge-drop-old-syntax:
      merge: drop 'git merge <message> HEAD <commit>' syntax
    gitster committed Dec 5, 2016
  12. Start post 2.11 cycle

    For now, let's call it 2.12 tentatively.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 5, 2016
  13. Sync with maint-2.10

    * maint-2.10:
      preparing for 2.10.3
    gitster committed Dec 5, 2016
  14. preparing for 2.10.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 5, 2016
  15. Merge branch 'jk/common-main' into maint-2.10

    * jk/common-main:
      common-main: stop munging argv[0] path
      git-compat-util: move content inside ifdef/endif guards
    gitster committed Dec 5, 2016
Commits on Nov 29, 2016
  1. Merge branch 'tk/diffcore-delta-remove-unused' into maint

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

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

    Typofix.
    
    * nd/worktree-lock:
      git-worktree.txt: fix typo "to"/"two", and add comma
    gitster committed Nov 29, 2016
  4. Merge branch 'ps/common-info-doc' into maint

    Doc fix.
    
    * ps/common-info-doc:
      doc: fix location of 'info/' with $GIT_COMMON_DIR
    gitster committed Nov 29, 2016
  5. Merge branch 'rs/cocci' into maint

    Improve the rule to convert "unsigned char [20]" into "struct
    object_id *" in contrib/coccinelle/
    
    * rs/cocci:
      cocci: avoid self-references in object_id transformations
    gitster committed Nov 29, 2016
  6. Merge branch 'nd/test-helpers' into maint

    Update to the test framework made in 2.9 timeframe broke running
    the tests under valgrind, which has been fixed.
    
    * nd/test-helpers:
      valgrind: support test helpers
    gitster committed Nov 29, 2016
  7. Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint

    Documentation fix.
    
    * sc/fmt-merge-msg-doc-markup-fix:
      Documentation/fmt-merge-msg: fix markup in example
    gitster committed Nov 29, 2016
  8. Merge branch 'rs/commit-pptr-simplify' into maint

    Code simplification.
    
    * rs/commit-pptr-simplify:
      commit: simplify building parents list
    gitster committed Nov 29, 2016
  9. Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint

    Documentation fix.
    
    * jk/rebase-config-insn-fmt-docfix:
      doc: fix missing "::" in config list
    gitster committed Nov 29, 2016
  10. Merge branch 'ak/pre-receive-hook-template-modefix' into maint

    A trivial clean-up to a recently graduated topic.
    
    * ak/pre-receive-hook-template-modefix:
      pre-receive.sample: mark it executable
    gitster committed Nov 29, 2016
  11. Merge branch 'ls/macos-update' into maint

    Portability update and workaround for builds on recent Mac OS X.
    
    * ls/macos-update:
      travis-ci: disable GIT_TEST_HTTPD for macOS
      Makefile: set NO_OPENSSL on macOS by default
    gitster committed Nov 29, 2016
  12. Merge branch 'as/merge-attr-sleep' into maint

    Fix for a racy false-positive test failure.
    
    * as/merge-attr-sleep:
      t6026: clarify the point of "kill $(cat sleep.pid)"
      t6026: ensure that long-running script really is
      Revert "t6026-merge-attr: don't fail if sleep exits early"
      Revert "t6026-merge-attr: ensure that the merge driver was called"
      t6026-merge-attr: ensure that the merge driver was called
      t6026-merge-attr: don't fail if sleep exits early
    gitster committed Nov 29, 2016
  13. Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maint

    Recent update to git-sh-setup (a library of shell functions that
    are used by our in-tree scripted Porcelain commands) included
    another shell library git-sh-i18n without specifying where it is,
    relying on the $PATH.  This has been fixed to be more explicit by
    prefixing $(git --exec-path) output in front.
    
    * ak/sh-setup-dot-source-i18n-fix:
      git-sh-setup: be explicit where to dot-source git-sh-i18n from.
    gitster committed Nov 29, 2016
  14. Merge branch 'jk/daemon-path-ok-check-truncation' into maint

    "git daemon" used fixed-length buffers to turn URL to the
    repository the client asked for into the server side directory
    path, using snprintf() to avoid overflowing these buffers, but
    allowed possibly truncated paths to the directory.  This has been
    tightened to reject such a request that causes overlong path to be
    required to serve.
    
    * jk/daemon-path-ok-check-truncation:
      daemon: detect and reject too-long paths
    gitster committed Nov 29, 2016
  15. Merge branch 'rs/ring-buffer-wraparound' into maint

    The code that we have used for the past 10+ years to cycle
    4-element ring buffers turns out to be not quite portable in
    theoretical world.
    
    * rs/ring-buffer-wraparound:
      hex: make wraparound of the index into ring-buffer explicit
    gitster committed Nov 29, 2016
  16. Merge branch 'mm/send-email-cc-cruft-after-address' into maint

    "git send-email" attempts to pick up valid e-mails from the
    trailers, but people in real world write non-addresses there, like
    "Cc: Stable <add@re.ss> # 4.8+", which broke the output depending
    on the availability and vintage of Mail::Address perl module.
    
    * mm/send-email-cc-cruft-after-address:
      Git.pm: add comment pointing to t9000
      t9000-addresses: update expected results after fix
      parse_mailboxes: accept extra text after <...> address
    gitster committed Nov 29, 2016
  17. Merge branch 'cp/completion-negative-refs' into maint

    The command-line completion script (in contrib/) learned to
    complete "git cmd ^mas<HT>" to complete the negative end of
    reference to "git cmd ^master".
    
    * cp/completion-negative-refs:
      completion: support excluding refs
    gitster committed Nov 29, 2016
  18. Merge branch 'jc/am-read-author-file' into maint

    Extract a small helper out of the function that reads the authors
    script file "git am" internally uses.
    This by itself is not useful until a second caller appears in the
    future for "rebase -i" helper.
    
    * jc/am-read-author-file:
      am: refactor read_author_script()
    gitster committed Nov 29, 2016
  19. Git 2.11

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 29, 2016
  20. Merge branch 'jk/common-main'

    Fix for a small regression in a topic already in 'master'.
    
    * jk/common-main:
      common-main: stop munging argv[0] path
    gitster committed Nov 29, 2016