1. 05 6月, 2017 11 次提交
  2. 02 6月, 2017 21 次提交
  3. 30 5月, 2017 8 次提交
    • J
      Fourth batch for 2.14 · 0339965c
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      0339965c
    • J
      Merge branch 'dt/unpack-save-untracked-cache-extension' · fa0624f7
      Junio C Hamano 提交于
      When "git checkout", "git merge", etc. manipulates the in-core
      index, various pieces of information in the index extensions are
      discarded from the original state, as it is usually not the case
      that they are kept up-to-date and in-sync with the operation on the
      main index.  The untracked cache extension is copied across these
      operations now, which would speed up "git status" (as long as the
      cache is properly invalidated).
      
      * dt/unpack-save-untracked-cache-extension:
        unpack-trees: preserve index extensions
      fa0624f7
    • J
      Merge branch 'js/larger-timestamps' · 35d802d2
      Junio C Hamano 提交于
      A follow-up hotfix for a topic already in 'master'.
      
      * js/larger-timestamps:
        name-rev: change a "long" variable to timestamp_t
      35d802d2
    • J
      Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' · 663bf043
      Junio C Hamano 提交于
      "git send-email" now uses Net::SMTP::SSL, which is obsolete, only
      when needed.  Recent versions of Net::SMTP can do TLS natively.
      
      * dk/send-email-avoid-net-smtp-ssl-when-able:
        send-email: Net::SMTP::SSL is obsolete, use only when necessary
      663bf043
    • J
      Merge branch 'jc/skip-test-in-the-middle' · 9aa55594
      Junio C Hamano 提交于
      A recent update to t5545-push-options.sh started skipping all the
      tests in the script when a web server testing is disabled or
      unavailable, not just the ones that require a web server.  Non HTTP
      tests have been salvaged to always run in this script.
      
      * jc/skip-test-in-the-middle:
        t5545: enhance test coverage when no http server is installed
        test: allow skipping the remainder
      9aa55594
    • J
      Merge branch 'ab/conditional-config-with-symlinks' · b784d0be
      Junio C Hamano 提交于
      The recently introduced "[includeIf "gitdir:$dir"] path=..."
      mechansim has further been taught to take symlinks into account.
      The directory "$dir" specified in "gitdir:$dir" may be a symlink to
      a real location, not something that $(getcwd) may return.  In such
      a case, a realpath of "$dir" is compared with the real path of the
      current repository to determine if the contents from the named path
      should be included.
      
      * ab/conditional-config-with-symlinks:
        config: match both symlink & realpath versions in IncludeIf.gitdir:*
      b784d0be
    • J
      Merge branch 'jt/fetch-allow-tip-sha1-implicitly' · 02c531eb
      Junio C Hamano 提交于
      There is no good reason why "git fetch $there $sha1" should fail
      when the $sha1 names an object at the tip of an advertised ref,
      even when the other side hasn't enabled allowTipSHA1InWant.
      
      * jt/fetch-allow-tip-sha1-implicitly:
        fetch-pack: always allow fetching of literal SHA1s
      02c531eb
    • J
      Merge branch 'jt/send-email-validate-hook' · 07d4c760
      Junio C Hamano 提交于
      "git send-email" learned to run sendemail-validate hook to inspect
      and reject a message before sending it out.
      
      * jt/send-email-validate-hook:
        send-email: support validate hook
      07d4c760