Skip to content
Commits on May 2, 2016
  1. Sync with maint

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

    committed May 2, 2016
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'jk/use-write-script-more' into maint

    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
  4. Merge branch 'jc/xstrfmt-null-with-prec-0' into maint

    committed May 2, 2016
    Code cleanup.
    
    * jc/xstrfmt-null-with-prec-0:
      setup.c: do not feed NULL to "%.*s" even with precision 0
  5. Merge branch 'ew/send-email-drop-data-dumper' into maint

    committed May 2, 2016
    Code clean-up.
    
    * ew/send-email-drop-data-dumper:
      send-email: do not load Data::Dumper
  6. Merge branch 'ad/cygwin-wants-rename' into maint

    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
  7. Merge branch 'jk/do-not-printf-NULL' into maint

    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
  8. Merge branch 'jc/http-socks5h' into maint

    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://
  9. Merge branch 'ky/imap-send' into maint

    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
  10. Merge branch 'ad/commit-have-m-option' into maint

    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
  11. Merge branch 'sb/submodule-helper-clone-regression-fix' into maint

    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
  12. Merge branch 'jk/branch-shortening-funny-symrefs' into maint

    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
  13. Merge branch 'es/format-patch-doc-hide-no-patch' into maint

    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
  14. Merge branch 'ky/branch-m-worktree' into maint

    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
  15. Merge branch 'ky/branch-d-worktree' into maint

    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
  16. Merge branch 'jk/check-repository-format' into maint

    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()
  17. Merge branch 'ew/send-email-readable-message-id' into maint

    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
Commits on Apr 29, 2016
  1. Eighth batch for 2.9

    committed Apr 29, 2016
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Sync with 2.8.2

    committed Apr 29, 2016
  3. Git 2.8.2

    committed Apr 29, 2016
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'js/mingw-tests-2.8' into maint

    committed Apr 29, 2016
    Code clean-up.
    
    * js/mingw-tests-2.8:
      Windows: shorten code by re-using convert_slashes()
  5. Merge branch 'ep/trace-doc-sample-fix' into maint

    committed Apr 29, 2016
    Fix a typo in an example in the trace API documentation.
    
    * ep/trace-doc-sample-fix:
      api-trace.txt: fix typo
  6. Merge branch 'jc/makefile-redirection-stderr' into maint

    committed Apr 29, 2016
    A minor fix in the Makefile.
    
    * jc/makefile-redirection-stderr:
      Makefile: fix misdirected redirections
  7. Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maint

    committed Apr 29, 2016
    Minor code cleanup.
    
    * ak/use-hashmap-iter-first-in-submodule-config:
      submodule-config: use hashmap_iter_first()
  8. Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into…

    committed Apr 29, 2016
    … maint
    
    When running "git blame $path" with unnormalized data in the index
    for the path, the data in the working tree was blamed, even though
    "git add" would not have changed what is already in the index, due
    to "safe crlf" that disables the line-end conversion.  It has been
    corrected.
    
    * tb/blame-force-read-cache-to-workaround-safe-crlf:
      correct blame for files commited with CRLF
  9. Merge branch 'sk/send-pack-all-fix' into maint

    committed Apr 29, 2016
    "git send-pack --all <there>" was broken when its command line
    option parsing was written in the 2.6 timeframe.
    
    * sk/send-pack-all-fix:
      git-send-pack: fix --all option when used with directory
  10. Merge branch 'sg/diff-multiple-identical-renames' into maint

    committed Apr 29, 2016
    "git diff -M" used to work better when two originally identical
    files A and B got renamed to X/A and X/B by pairing A to X/A and B
    to X/B, but this was broken in the 2.0 timeframe.
    
    * sg/diff-multiple-identical-renames:
      diffcore: fix iteration order of identical files during rename detection
  11. Merge branch 'ss/msvc' into maint

    committed Apr 29, 2016
    Build updates for MSVC.
    
    * ss/msvc:
      MSVC: use shipped headers instead of fallback definitions
      MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more
  12. Merge branch 'st/verify-tag'

    committed Apr 29, 2016
    Unify internal logic between "git tag -v" and "git verify-tag"
    commands by making one directly call into the other.
    
    * st/verify-tag:
      tag -v: verify directly rather than exec-ing verify-tag
      verify-tag: move tag verification code to tag.c
      verify-tag: prepare verify_tag for libification
      verify-tag: update variable name and type
      t7030: test verifying multiple tags
      builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
  13. Merge branch 'js/win32-mmap'

    committed Apr 29, 2016
    mmap emulation on Windows has been optimized and work better without
    consuming paging store when not needed.
    
    * js/win32-mmap:
      mmap(win32): avoid expensive fstat() call
      mmap(win32): avoid copy-on-write when it is unnecessary
      win32mmap: set errno appropriately
  14. Merge branch 'jc/merge-refuse-new-root'

    committed Apr 29, 2016
    "git pull" has been taught to pass --allow-unrelated-histories
    option to underlying "git merge".
    
    * jc/merge-refuse-new-root:
      pull: pass --allow-unrelated-histories to "git merge"
      t3033: avoid 'ambiguous refs' warning
  15. Merge branch 'jk/push-client-deadlock-fix'

    committed Apr 29, 2016
    "git push" from a corrupt repository that attempts to push a large
    number of refs deadlocked; the thread to relay rejection notices
    for these ref updates blocked on writing them to the main thread,
    after the main thread at the receiving end notices that the push
    failed and decides not to read these notices and return a failure.
    
    * jk/push-client-deadlock-fix:
      t5504: drop sigpipe=ok from push tests
      fetch-pack: isolate sigpipe in demuxer thread
      send-pack: isolate sigpipe in demuxer thread
      run-command: teach async threads to ignore SIGPIPE
      send-pack: close demux pipe before finishing async process
  16. Merge branch 'js/replace-edit-use-editor-configuration'

    committed Apr 29, 2016
    "git replace -e" did not honour "core.editor" configuration.
    
    * js/replace-edit-use-editor-configuration:
      replace --edit: respect core.editor
  17. Merge branch 'sb/mv-submodule-fix'

    committed Apr 29, 2016
    "git mv old new" did not adjust the path for a submodule that lives
    as a subdirectory inside old/ directory correctly.
    
    * sb/mv-submodule-fix:
      mv: allow moving nested submodules
  18. Merge branch 'nd/test-helpers'

    committed Apr 29, 2016
    Sources to many test helper binaries (and the generated helpers)
    have been moved to t/helper/ subdirectory to reduce clutter at the
    top level of the tree.
    
    * nd/test-helpers:
      test helpers: move test-* to t/helper/ subdirectory
      Makefile: clean *.o files we create
Something went wrong with that request. Please try again.