Skip to content
Commits on May 3, 2016
  1. @gitster

    Sync with master

    gitster committed May 3, 2016
    * master:
      Ninth batch for 2.9
      git-multimail: update to release 1.3.0
  2. @gitster

    Merge branch 'sb/submodule-init' into next

    gitster committed May 3, 2016
    Update of "git submodule" to move pieces of logic to C continues.
    
    * sb/submodule-init:
      submodule init: redirect stdout to stderr
  3. @gitster

    Sync with maint

    gitster committed May 3, 2016
    * maint:
      git-multimail: update to release 1.3.0
  4. @gitster

    Ninth batch for 2.9

    gitster committed May 3, 2016
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'nf/mergetool-prompt'

    gitster committed May 3, 2016
    UI consistency improvements.
    
    * nf/mergetool-prompt:
      difftool/mergetool: make the form of yes/no questions consistent
  6. @gitster

    Merge branch 'jd/send-email-to-whom'

    gitster committed May 3, 2016
    A question by "git send-email" to ask the identity of the sender
    has been updated.
    
    * jd/send-email-to-whom:
      send-email: fix grammo in the prompt that asks e-mail recipients
  7. @gitster

    Merge branch 'rt/string-list-lookup-cleanup'

    gitster committed May 3, 2016
    Code cleanup.
    
    * rt/string-list-lookup-cleanup:
      string_list: use string-list API in unsorted_string_list_lookup()
  8. @gitster

    Merge branch 'jk/fix-attribute-macro-in-2.5'

    gitster committed May 3, 2016
    Code fixup.
    
    * jk/fix-attribute-macro-in-2.5:
      remote.c: spell __attribute__ correctly
  9. @gitster

    Merge branch 'sg/test-lib-simplify-expr-away'

    gitster committed May 3, 2016
    Code cleanup.
    
    * sg/test-lib-simplify-expr-away:
      test-lib: simplify '--option=value' parsing
  10. @gitster

    Merge branch 'nd/remove-unused'

    gitster committed May 3, 2016
    Code cleanup.
    
    * nd/remove-unused:
      wrapper.c: delete dead function git_mkstemps()
      dir.c: remove dead function fnmatch_icase()
  11. @gitster

    Merge branch 'js/name-rev-use-oldest-ref'

    gitster committed May 3, 2016
    "git describe --contains" often made a hard-to-justify choice of
    tag to give name to a given commit, because it tried to come up
    with a name with smallest number of hops from a tag, causing an old
    commit whose close descendant that is recently tagged were not
    described with respect to an old tag but with a newer tag.  It did
    not help that its computation of "hop" count was further tweaked to
    penalize being on a side branch of a merge.  The logic has been
    updated to favor using the tag with the oldest tagger date, which
    is a lot easier to explain to the end users: "We describe a commit
    in terms of the (chronologically) oldest tag that contains the
    commit."
    
    * js/name-rev-use-oldest-ref:
      name-rev: include taggerdate in considering the best name
  12. @gitster

    Merge branch 'jd/p4-jobs-in-commit'

    gitster committed May 3, 2016
    "git p4" learned to record P4 jobs in Git commit that imports from
    the history in Perforce.
    
    * jd/p4-jobs-in-commit:
      git-p4: add P4 jobs to git commit message
      git-p4: clean-up code style in tests
  13. @gitster

    Merge branch 'en/merge-fixes'

    gitster committed May 3, 2016
    "merge-recursive" strategy incorrectly checked if a path that is
    involved in its internal merge exists in the working tree.
    
    * en/merge-fixes:
      merge-recursive: do not check working copy when creating a virtual merge base
      merge-recursive: remove duplicate code
  14. @moy @gitster

    git-multimail: update to release 1.3.0

    moy committed with gitster May 3, 2016
    The changes are described in CHANGES.
    
    Contributions-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Contributions-by: Stefan Tatschner <rumpelsepp@sevenbyte.org>
    Contributions-by: Simon P <simon.git@le-huit.fr>
    Contributions-by: Leander Hasty <leander@1stplayable.com>
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. @stefanbeller @gitster

    submodule init: redirect stdout to stderr

    stefanbeller committed with gitster May 2, 2016
    Reroute the output of stdout to stderr as it is just informative
    messages, not to be consumed by machines.
    
    This should not regress any scripts that try to parse the
    current output, as the output is already internationalized
    and therefore unstable.
    
    We want to init submodules from the helper for `submodule update`
    in a later patch and the stdout output of said helper is consumed
    by the parts of `submodule update` which are still written in shell.
    So we have to be careful which messages are on stdout.
    
    Signed-off-by: Stefan Beller <sbeller@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 2, 2016
  1. @gitster

    Sync with master

    gitster committed May 2, 2016
    * master:
      Start preparing for 2.8.3
  2. @gitster

    Merge branch 'jk/diff-compact-heuristic' into next

    gitster committed May 2, 2016
    Patch output from "git diff" and friends has been tweaked to be
    more readable by using a blank line as a strong hint that the
    contents before and after it belong to a logically separate unit.
    
    * jk/diff-compact-heuristic:
      diff: undocument the compaction heuristic knobs for experimentation
  3. @gitster

    Sync with maint

    gitster committed May 2, 2016
    * maint:
      Start preparing for 2.8.3
  4. @gitster

    Start preparing for 2.8.3

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

    Merge branch 'jk/use-write-script-more' into maint

    gitster committed May 2, 2016
    Code clean-up.
    
    * jk/use-write-script-more:
      t3404: use write_script
      t1020: do not overuse printf and use write_script
      t5532: use write_script
  6. @gitster

    Merge branch 'jc/xstrfmt-null-with-prec-0' into maint

    gitster committed May 2, 2016
    Code cleanup.
    
    * jc/xstrfmt-null-with-prec-0:
      setup.c: do not feed NULL to "%.*s" even with precision 0
  7. @gitster

    Merge branch 'ew/send-email-drop-data-dumper' into maint

    gitster committed May 2, 2016
    Code clean-up.
    
    * ew/send-email-drop-data-dumper:
      send-email: do not load Data::Dumper
  8. @gitster

    Merge branch 'ad/cygwin-wants-rename' into maint

    gitster committed May 2, 2016
    On Cygwin, object creation uses the "create a temporary and then
    rename it to the final name" pattern, not "create a temporary,
    hardlink it to the final name and then unlink the temporary"
    pattern.
    
    This is necessary to use Git on Windows shared directories, and is
    already enabled for the MinGW and plain Windows builds.  It also
    has been used in Cygwin packaged versions of Git for quite a while.
    See http://thread.gmane.org/gmane.comp.version-control.git/291853
    ($gmane/275680, $gmane/291853).
    
    * ad/cygwin-wants-rename:
      config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
  9. @gitster

    Merge branch 'jk/do-not-printf-NULL' into maint

    gitster committed May 2, 2016
    "git config" had a codepath that tried to pass a NULL to
    printf("%s"), which nobody seems to have noticed.
    
    * jk/do-not-printf-NULL:
      git_config_set_multivar_in_file: handle "unset" errors
      git_config_set_multivar_in_file: all non-zero returns are errors
      config: lower-case first word of error strings
  10. @gitster

    Merge branch 'jc/http-socks5h' into maint

    gitster committed May 2, 2016
    The socks5:// proxy support added back in 2.6.4 days was not aware
    that socks5h:// proxies behave differently.
    
    * jc/http-socks5h:
      http: differentiate socks5:// and socks5h://
  11. @gitster

    Merge branch 'ky/imap-send' into maint

    gitster committed May 2, 2016
    Support for CRAM-MD5 authentication method in "git imap-send" did
    not work well.
    
    * ky/imap-send:
      imap-send: fix CRAM-MD5 response calculation
      imap-send: check for NOLOGIN capability only when using LOGIN command
  12. @gitster

    Merge branch 'ad/commit-have-m-option' into maint

    gitster committed May 2, 2016
    "git commit" misbehaved in a few minor ways when an empty message
    is given via -m '', all of which has been corrected.
    
    * ad/commit-have-m-option:
      commit: do not ignore an empty message given by -m ''
      commit: --amend -m '' silently fails to wipe message
  13. @gitster

    Merge branch 'sb/submodule-helper-clone-regression-fix' into maint

    gitster committed May 2, 2016
    A partial rewrite of "git submodule" in the 2.7 timeframe changed
    the way the gitdir: pointer in the submodules point at the real
    repository location to use absolute paths by accident.  This has
    been corrected.
    
    * sb/submodule-helper-clone-regression-fix:
      submodule--helper, module_clone: catch fprintf failure
      submodule--helper: do not borrow absolute_path() result for too long
      submodule--helper, module_clone: always operate on absolute paths
      submodule--helper clone: create the submodule path just once
      submodule--helper: fix potential NULL-dereference
      recursive submodules: test for relative paths
  14. @gitster

    Merge branch 'jk/branch-shortening-funny-symrefs' into maint

    gitster committed May 2, 2016
    A change back in version 2.7 to "git branch" broke display of a
    symbolic ref in a non-standard place in the refs/ hierarchy (we
    expect symbolic refs to appear in refs/remotes/*/HEAD to point at
    the primary branch the remote has, and as .git/HEAD to point at the
    branch we locally checked out).
    
    * jk/branch-shortening-funny-symrefs:
      branch: fix shortening of non-remote symrefs
  15. @gitster

    Merge branch 'es/format-patch-doc-hide-no-patch' into maint

    gitster committed May 2, 2016
    "git format-patch --help" showed `-s` and `--no-patch` as if these
    are valid options to the command.  We already hide `--patch` option
    from the documentation, because format-patch is about showing the
    diff, and the documentation now hides these options as well.
    
    * es/format-patch-doc-hide-no-patch:
      git-format-patch.txt: don't show -s as shorthand for multiple options
  16. @gitster

    Merge branch 'ky/branch-m-worktree' into maint

    gitster committed May 2, 2016
    When "git worktree" feature is in use, "git branch -m" renamed a
    branch that is checked out in another worktree without adjusting
    the HEAD symbolic ref for the worktree.
    
    * ky/branch-m-worktree:
      set_worktree_head_symref(): fix error message
      branch -m: update all per-worktree HEADs
      refs: add a new function set_worktree_head_symref
  17. @gitster

    Merge branch 'ky/branch-d-worktree' into maint

    gitster committed May 2, 2016
    When "git worktree" feature is in use, "git branch -d" allowed
    deletion of a branch that is checked out in another worktree
    
    * ky/branch-d-worktree:
      branch -d: refuse deleting a branch which is currently checked out
  18. @gitster

    Merge branch 'jk/check-repository-format' into maint

    gitster committed May 2, 2016
    The repository set-up sequence has been streamlined (the biggest
    change is that there is no longer git_config_early()), so that we
    do not attempt to look into refs/* when we know we do not have a
    Git repository.
    
    * jk/check-repository-format:
      verify_repository_format: mark messages for translation
      setup: drop repository_format_version global
      setup: unify repository version callbacks
      init: use setup.c's repo version verification
      setup: refactor repo format reading and verification
      config: drop git_config_early
      check_repository_format_gently: stop using git_config_early
      lazily load core.sharedrepository
      wrap shared_repository global in get/set accessors
      setup: document check_repository_format()
  19. @gitster

    Merge branch 'ew/send-email-readable-message-id' into maint

    gitster committed May 2, 2016
    "git send-email" now uses a more readable timestamps when
    formulating a message ID.
    
    * ew/send-email-readable-message-id:
      send-email: more meaningful Message-ID
  20. @gitster

    diff: undocument the compaction heuristic knobs for experimentation

    gitster committed May 2, 2016
    It seems that people around here are all happy with the updated
    heuristics used to decide where the hunks are separated.  Let's keep
    that as the default.  Even though we do not expect too much trouble
    from the difference between the old and the new algorithms, just in
    case let's leave the implementation of the knobs to turn it off for
    emergencies.  There is no longer need for documenting them, though.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.