Skip to content
Commits on Apr 22, 2016
  1. @gitster

    Sixth batch for post 2.8 cycle

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

    Merge branch 'ad/cygwin-wants-rename'

    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
    gitster committed Apr 22, 2016
  3. @gitster

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

    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
    gitster committed Apr 22, 2016
  4. @gitster

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

    "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
    gitster committed Apr 22, 2016
  5. @gitster

    Merge branch 'jc/http-socks5h'

    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://
    gitster committed Apr 22, 2016
  6. @gitster

    Merge branch 'ky/imap-send-openssl-1.1.0'

    Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
    we use in imap-send, which has been adjusted for the change.
    
    * ky/imap-send-openssl-1.1.0:
      configure: remove checking for HMAC_CTX_cleanup
      imap-send: avoid deprecated TLSv1_method()
      imap-send: check NULL return of SSL_CTX_new()
      imap-send: use HMAC() function provided by OpenSSL
    gitster committed Apr 22, 2016
  7. @gitster

    Merge branch 'ky/imap-send'

    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
    gitster committed Apr 22, 2016
  8. @gitster

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

    * jc/xstrfmt-null-with-prec-0:
      setup.c: do not feed NULL to "%.*s" even with precision 0
    gitster committed Apr 22, 2016
  9. @gitster

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

    "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
    gitster committed Apr 22, 2016
  10. @gitster

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

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

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

    "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
    gitster committed Apr 22, 2016
  12. @gitster

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

    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
    gitster committed Apr 22, 2016
Commits on Apr 18, 2016
  1. @gitster

    Fifth batch for post 2.8 cycle

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

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

    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
    gitster committed Apr 18, 2016
  3. @gitster

    Merge branch 'ky/branch-m-worktree'

    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
    gitster committed Apr 18, 2016
Commits on Apr 15, 2016
  1. @gitster

    Merge branch 'maint'

    * maint:
      Prepare for 2.8.2
      Start preparing for 2.8.2
    gitster committed Apr 14, 2016
  2. @gitster

    Prepare for 2.8.2

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

    Merge branch 'jv/merge-nothing-into-void' into maint

    "git merge FETCH_HEAD" dereferenced NULL pointer when merging
    nothing into an unborn history (which is arguably unusual usage,
    which perhaps was the reason why nobody noticed it).
    
    * jv/merge-nothing-into-void:
      merge: fix NULL pointer dereference when merging nothing into void
    gitster committed Apr 14, 2016
  4. @gitster

    Merge branch 'ss/commit-squash-msg' into maint

    When "git merge --squash" stopped due to conflict, the concluding
    "git commit" failed to read in the SQUASH_MSG that shows the log
    messages from all the squashed commits.
    
    * ss/commit-squash-msg:
      commit: do not lose SQUASH_MSG contents
    gitster committed Apr 14, 2016
  5. @gitster

    Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint

    "git send-email" had trouble parsing alias file in mailrc format
    when lines in it had trailing whitespaces on them.
    
    * jk/send-email-rtrim-mailrc-alias:
      send-email: ignore trailing whitespace in mailrc alias file
    gitster committed Apr 14, 2016
  6. @gitster

    Merge branch 'da/mergetool-delete-delete-conflict' into maint

    "git mergetool" did not work well with conflicts that both sides
    deleted.
    
    * da/mergetool-delete-delete-conflict:
      mergetool: honor tempfile configuration when resolving delete conflicts
      mergetool: support delete/delete conflicts
    gitster committed Apr 14, 2016
  7. @gitster

    Merge branch 'jk/startup-info' into maint

    The startup_info data, which records if we are working inside a
    repository (among other things), are now uniformly available to Git
    subcommand implementations, and Git avoids attempting to touch
    references when we are not in a repository.
    
    * jk/startup-info:
      use setup_git_directory() in test-* programs
      grep: turn off gitlink detection for --no-index
      mailmap: do not resolve blobs in a non-repository
      remote: don't resolve HEAD in non-repository
      setup: set startup_info->have_repository more reliably
      setup: make startup_info available everywhere
    gitster committed Apr 14, 2016
  8. @gitster

    Merge branch 'jk/getwholeline-getdelim-empty' into maint

    strbuf_getwholeline() did not NUL-terminate the buffer on certain
    corner cases in its error codepath.
    
    * jk/getwholeline-getdelim-empty:
      strbuf_getwholeline: NUL-terminate getdelim buffer on error
    gitster committed Apr 14, 2016
  9. @gitster

    Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint

    A small memory leak in an error codepath has been plugged in xdiff
    code.
    
    * rj/xdiff-prepare-plug-leak-on-error-codepath:
      xdiff/xprepare: fix a memory leak
      xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
    gitster committed Apr 14, 2016
  10. @gitster

    Merge branch 'gf/fetch-pack-direct-object-fetch' into maint

    Fetching of history by naming a commit object name directly didn't
    work across remote-curl transport.
    
    * gf/fetch-pack-direct-object-fetch:
      fetch-pack: update the documentation for "<refs>..." arguments
      fetch-pack: fix object_id of exact sha1
    gitster committed Apr 14, 2016
  11. @gitster

    Merge branch 'jk/rev-parse-local-env-vars' into maint

    The "--local-env-vars" and "--resolve-git-dir" options of "git
    rev-parse" failed to work outside a repository when the command's
    option parsing was rewritten in 1.8.5 era.
    
    * jk/rev-parse-local-env-vars:
      rev-parse: let some options run outside repository
      t1515: add tests for rev-parse out-of-repo helpers
    gitster committed Apr 14, 2016
  12. @gitster

    Merge branch 'jk/config-get-urlmatch' into maint

    "git config --get-urlmatch", unlike other variants of the "git
    config --get" family, did not signal error with its exit status
    when there was no matching configuration.
    
    * jk/config-get-urlmatch:
      Documentation/git-config: fix --get-all description
      Documentation/git-config: use bulleted list for exit codes
      config: fail if --get-urlmatch finds no value
    gitster committed Apr 14, 2016
  13. @gitster

    Merge branch 'pb/t7502-drop-dup' into maint

    Code clean-up.
    
    * pb/t7502-drop-dup:
      t/t7502 : drop duplicate test
    gitster committed Apr 14, 2016
  14. @gitster

    Merge branch 'jk/test-httpd-config-nosystem' into maint

    The tests that involve running httpd leaked the system-wide
    configuration in /etc/gitconfig to the tested environment.
    
    * jk/test-httpd-config-nosystem:
      t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
    gitster committed Apr 14, 2016
  15. @gitster

    Merge branch 'sb/clone-t57-t56' into maint

    Rename bunch of tests on "git clone" for better organization.
    
    * sb/clone-t57-t56:
      clone tests: rename t57* => t56*
    gitster committed Apr 14, 2016
  16. @gitster

    Merge branch 'jk/credential-cache-comment-exit' into maint

    A code clarification.
    
    * jk/credential-cache-comment-exit:
      credential-cache--daemon: clarify "exit" action semantics
    gitster committed Apr 14, 2016
  17. @gitster

    Merge branch 'jc/index-pack' into maint

    Code clean-up.
    
    * jc/index-pack:
      index-pack: add a helper function to derive .idx/.keep filename
      index-pack: correct --keep[=<msg>]
    gitster committed Apr 14, 2016
  18. @gitster

    Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint

    Code clean-up.
    
    * ss/exc-flag-is-a-collection-of-bits:
      dir: store EXC_FLAG_* values in unsigned integers
    gitster committed Apr 14, 2016
  19. @gitster

    Merge branch 'mp/upload-pack-use-embedded-args' into maint

    The embedded args argv-array in the child process is used to build
    the command line to run pack-objects instead of using a separate
    array of strings.
    
    * mp/upload-pack-use-embedded-args:
      upload-pack: use argv_array for pack_objects
    gitster committed Apr 14, 2016
  20. @gitster

    Merge branch 'oa/doc-diff-check' into maint

    A minor documentation update.
    
    * oa/doc-diff-check:
      Documentation: git diff --check detects conflict markers
    gitster committed Apr 14, 2016
Something went wrong with that request. Please try again.