1. 12 11月, 2018 12 次提交
  2. 06 11月, 2018 16 次提交
    • J
      Ninth batch for 2.20 · 8858448b
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      8858448b
    • J
      Merge branch 'sg/test-verbose-log' · 67f673aa
      Junio C Hamano 提交于
      Our test scripts can now take the '-V' option as a synonym for the
      '--verbose-log' option.
      
      * sg/test-verbose-log:
        test-lib: introduce the '-V' short option for '--verbose-log'
      67f673aa
    • J
      Merge branch 'rj/header-cleanup' · 6b37389f
      Junio C Hamano 提交于
      Code cleanup.
      
      * rj/header-cleanup:
        commit-reach.h: add missing declarations (hdr-check)
        ewok_rlw.h: add missing 'inline' to function definition
        fetch-object.h: add missing declaration (hdr-check)
      6b37389f
    • J
      Merge branch 'ss/travis-ci-force-vm-mode' · 6af9ca24
      Junio C Hamano 提交于
      The "container" mode of TravisCI is going away.  Our .travis.yml
      file is getting prepared for the transition.
      
      * ss/travis-ci-force-vm-mode:
        travis-ci: no longer use containers
      6af9ca24
    • J
      Merge branch 'sg/test-rebase-editor-fix' · b3635c15
      Junio C Hamano 提交于
      * sg/test-rebase-editor-fix:
        t3404-rebase-interactive: test abbreviated commands
      b3635c15
    • J
      Merge branch 'tb/char-may-be-unsigned' · 1f8e7dc4
      Junio C Hamano 提交于
      Build portability fix.
      
      * tb/char-may-be-unsigned:
        path.c: char is not (always) signed
      1f8e7dc4
    • J
      Merge branch 'js/mingw-ns-filetime' · b9c3f062
      Junio C Hamano 提交于
      Windows port learned to use nano-second resolution file timestamps.
      
      * js/mingw-ns-filetime:
        mingw: implement nanosecond-precision file times
        mingw: replace MSVCRT's fstat() with a Win32-based implementation
        mingw: factor out code to set stat() data
      b9c3f062
    • J
      Merge branch 'md/exclude-promisor-objects-fix' · a29b8bcf
      Junio C Hamano 提交于
      Operations on promisor objects make sense in the context of only a
      small subset of the commands that internally use the revisions
      machinery, but the "--exclude-promisor-objects" option were taken
      and led to nonsense results by commands like "log", to which it
      didn't make much sense.  This has been corrected.
      
      * md/exclude-promisor-objects-fix:
        exclude-promisor-objects: declare when option is allowed
        Documentation/git-log.txt: do not show --exclude-promisor-objects
      a29b8bcf
    • J
      Merge branch 'jw/send-email-no-auth' · 8ac6990b
      Junio C Hamano 提交于
      "git send-email" learned to disable SMTP authentication via the
      "--smtp-auth=none" option, even when the smtp username is given
      (which turns the authentication on by default).
      
      * jw/send-email-no-auth:
        send-email: explicitly disable authentication
      8ac6990b
    • J
      Merge branch 'nd/submodule-unused-vars' · 1443ca9a
      Junio C Hamano 提交于
      Code clean-up.
      
      * nd/submodule-unused-vars:
        submodule.c: remove some of the_repository references
      1443ca9a
    • J
      Merge branch 'nd/unpack-trees-with-cache-tree' · 65f7a323
      Junio C Hamano 提交于
      Trivial bugfix.
      
      * nd/unpack-trees-with-cache-tree:
        read-cache: use of memory after it is freed
      65f7a323
    • J
      Merge branch 'nd/completion-negation' · 9ffcf754
      Junio C Hamano 提交于
      The command line completion machinery (in contrib/) has been
      updated to allow the completion script to tweak the list of options
      that are reported by the parse-options machinery correctly.
      
      * nd/completion-negation:
        completion: fix __gitcomp_builtin no longer consider extra options
      9ffcf754
    • J
      Merge branch 'jt/upload-pack-v2-fix-shallow' · 3df27e0e
      Junio C Hamano 提交于
      "git fetch" over protocol v2 into a shallow repository failed to
      fetch full history behind a new tip of history that was diverged
      before the cut-off point of the history that was previously fetched
      shallowly.
      
      * jt/upload-pack-v2-fix-shallow:
        upload-pack: clear flags before each v2 request
        upload-pack: make want_obj not global
        upload-pack: make have_obj not global
      3df27e0e
    • J
      Merge branch 'sb/submodule-url-to-absolute' · 3fc8522e
      Junio C Hamano 提交于
      Some codepaths failed to form a proper URL when .gitmodules record
      the URL to a submodule repository as relative to the repository of
      superproject, which has been corrected.
      
      * sb/submodule-url-to-absolute:
        submodule helper: convert relative URL to absolute URL if needed
      3fc8522e
    • J
      Merge branch 'js/shallow-and-fetch-prune' · ea100b6d
      Junio C Hamano 提交于
      "git repack" in a shallow clone did not correctly update the
      shallow points in the repository, leading to a repository that
      does not pass fsck.
      
      * js/shallow-and-fetch-prune:
        repack -ad: prune the list of shallow commits
        shallow: offer to prune only non-existing entries
        repack: point out a bug handling stale shallow info
      ea100b6d
    • J
      Merge branch 'js/remote-archive-dwimfix' · a5ab66ee
      Junio C Hamano 提交于
      The logic to determine the archive type "git archive" uses did not
      correctly kick in for "git archive --remote", which has been
      corrected.
      
      * js/remote-archive-dwimfix:
        archive: initialize archivers earlier
      a5ab66ee
  3. 02 11月, 2018 12 次提交
    • J
      Merge branch 'jc/http-curlver-warnings' · cd69ec8c
      Junio C Hamano 提交于
      Warning message fix.
      
      * jc/http-curlver-warnings:
        http: give curl version warnings consistently
      cd69ec8c
    • J
      Merge branch 'js/mingw-http-ssl' · d7b18597
      Junio C Hamano 提交于
      On platforms with recent cURL library, http.sslBackend configuration
      variable can be used to choose a different SSL backend at runtime.
      The Windows port uses this mechanism to switch between OpenSSL and
      Secure Channel while talking over the HTTPS protocol.
      
      * js/mingw-http-ssl:
        http: when using Secure Channel, ignore sslCAInfo by default
        http: add support for disabling SSL revocation checks in cURL
        http: add support for selecting SSL backends at runtime
      d7b18597
    • J
      Merge branch 'mg/gpg-fingerprint' · 11cc180f
      Junio C Hamano 提交于
      New "--pretty=format:" placeholders %GF and %GP that show the GPG
      key fingerprints have been invented.
      
      * mg/gpg-fingerprint:
        gpg-interface.c: obtain primary key fingerprint as well
        gpg-interface.c: support getting key fingerprint via %GF format
        gpg-interface.c: use flags to determine key/signer info presence
      11cc180f
    • J
      Merge branch 'mg/gpg-parse-tighten' · 02561896
      Junio C Hamano 提交于
      Detect and reject a signature block that has more than one GPG
      signature.
      
      * mg/gpg-parse-tighten:
        gpg-interface.c: detect and reject multiple signatures on commits
      02561896
    • J
      Merge branch 'en/merge-cleanup-more' · ff8e25e9
      Junio C Hamano 提交于
      Further clean-up of merge-recursive machinery.
      
      * en/merge-cleanup-more:
        merge-recursive: avoid showing conflicts with merge branch before HEAD
        merge-recursive: improve auto-merging messages with path collisions
      ff8e25e9
    • J
      Eighth batch for 2.20 · d582ea20
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      d582ea20
    • J
      rebase: apply cocci patch · b17ca8f9
      Junio C Hamano 提交于
      Favor oideq() over !oidcmp() when checking for equality.
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      b17ca8f9
    • J
      Merge branch 'js/rebase-i-shortopt' · 85fcf1cb
      Junio C Hamano 提交于
      "git rebase -i" learned to take 'b' as the short form of 'break'
      option in the todo list.
      
      * js/rebase-i-shortopt:
        rebase -i: recognize short commands without arguments
      85fcf1cb
    • J
      Merge branch 'js/rebase-i-break' · 789b1f70
      Junio C Hamano 提交于
      "git rebase -i" learned a new insn, 'break', that the user can
      insert in the to-do list.  Upon hitting it, the command returns
      control back to the user.
      
      * js/rebase-i-break:
        rebase -i: introduce the 'break' command
        rebase -i: clarify what happens on a failed `exec`
      789b1f70
    • J
      Merge branch 'js/rebase-autostash-fix' · b78c5fe9
      Junio C Hamano 提交于
      "git rebase" that has recently been rewritten in C had a few issues
      in its "--autstash" feature, which have been corrected.
      
      * js/rebase-autostash-fix:
        rebase --autostash: fix issue with dirty submodules
        rebase --autostash: demonstrate a problem with dirty submodules
        rebase (autostash): use an explicit OID to apply the stash
        rebase (autostash): store the full OID in <state-dir>/autostash
        rebase (autostash): avoid duplicate call to state_dir_path()
      b78c5fe9
    • J
      Merge branch 'cb/printf-empty-format' · 9d322282
      Junio C Hamano 提交于
      Build fix for a topic in flight.
      
      * cb/printf-empty-format:
        sequencer: cleanup for gcc warning in non developer mode
      9d322282
    • J
      Merge branch 'jc/rebase-in-c-5-test-typofix' · 7ce32f72
      Junio C Hamano 提交于
      Typofix.
      
      * jc/rebase-in-c-5-test-typofix:
        rebase: fix typoes in error messages
      7ce32f72