1. 06 2月, 2019 27 次提交
    • J
      Fifth batch for 2.21 · 8feddda3
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      8feddda3
    • J
      Merge branch 'sg/object-as-type-commit-graph-fix' · 2ed3de43
      Junio C Hamano 提交于
      The commit-graph facility did not work when in-core objects that
      are promoted from unknown type to commit (e.g. a commit that is
      accessed via a tag that refers to it) were involved, which has been
      corrected.
      
      * sg/object-as-type-commit-graph-fix:
        object_as_type: initialize commit-graph-related fields of 'struct commit'
      2ed3de43
    • J
      Merge branch 'nd/fetch-compact-update' · d6cc1360
      Junio C Hamano 提交于
      "git fetch" output cleanup.
      
      * nd/fetch-compact-update:
        fetch: prefer suffix substitution in compact fetch.output
      d6cc1360
    • J
      Merge branch 'sg/strbuf-addbuf-cocci' · 5db56270
      Junio C Hamano 提交于
      Cocci rule update.
      
      * sg/strbuf-addbuf-cocci:
        strbuf.cocci: suggest strbuf_addbuf() to add one strbuf to an other
      5db56270
    • J
      Merge branch 'az/instaweb-py3-http-server' · abf39e33
      Junio C Hamano 提交于
      "git instaweb" learned to drive http.server that comes with
      "batteries included" Python installation (both Python2 & 3).
      
      * az/instaweb-py3-http-server:
        git-instaweb: add Python builtin http.server support
      abf39e33
    • J
      Merge branch 'pw/no-editor-in-rebase-i-implicit' · 69dd6e57
      Junio C Hamano 提交于
      When GIT_SEQUENCE_EDITOR is set, the command was incorrectly
      started when modes of "git rebase" that implicitly uses the
      machinery for the interactive rebase are run, which has been
      corrected.
      
      * pw/no-editor-in-rebase-i-implicit:
        implicit interactive rebase: don't run sequence editor
      69dd6e57
    • J
      Merge branch 'jk/diff-cc-stat-fixes' · 5d2710bd
      Junio C Hamano 提交于
      "git diff --color-moved --cc --stat -p" did not work well due to
      funny interaction between a bug in color-moved and the rest, which
      has been fixed.
      
      * jk/diff-cc-stat-fixes:
        combine-diff: treat --dirstat like --stat
        combine-diff: treat --summary like --stat
        combine-diff: treat --shortstat like --stat
        combine-diff: factor out stat-format mask
        diff: clear emitted_symbols flag after use
        t4006: resurrect commented-out tests
      5d2710bd
    • J
      Merge branch 'bp/checkout-new-branch-optim' · 5ad3550f
      Junio C Hamano 提交于
      "git checkout -b <new> [HEAD]" to create a new branch from the
      current commit and check it out ought to be a no-op in the index
      and the working tree in normal cases, but there are corner cases
      that do require updates to the index and the working tree.  Running
      it immediately after "git clone --no-checkout" is one of these
      cases that an earlier optimization kicked in incorrectly, which has
      been fixed.
      
      * bp/checkout-new-branch-optim:
        checkout: fix regression in checkout -b on intitial checkout
        checkout: add test demonstrating regression with checkout -b on initial commit
      5ad3550f
    • J
      Merge branch 'ja/doc-style-fix' · 264def5a
      Junio C Hamano 提交于
      Doc typo/stylo fixes.
      
      * ja/doc-style-fix:
        doc: tidy asciidoc style
      264def5a
    • J
      Merge branch 'ph/pack-objects-mutex-fix' · d243a323
      Junio C Hamano 提交于
      "git pack-objects" incorrectly used uninitialized mutex, which has
      been corrected.
      
      * ph/pack-objects-mutex-fix:
        pack-objects: merge read_lock and lock in packing_data struct
        pack-objects: move read mutex to packing_data struct
      d243a323
    • J
      Merge branch 'jk/attr-macro-fix' · 02bf766c
      Junio C Hamano 提交于
      Asking "git check-attr" about a macro (e.g. "binary") on a specific
      path did not work correctly, even though "git check-attr -a" listed
      such a macro correctly.  This has been corrected.
      
      * jk/attr-macro-fix:
        attr: do not mark queried macros as unset
      02bf766c
    • J
      Merge branch 'js/test-git-installed' · 11494daa
      Junio C Hamano 提交于
      Test fix for Windows.
      
      * js/test-git-installed:
        tests: explicitly use `test-tool.exe` on Windows
      11494daa
    • J
      Merge branch 'js/abspath-part-inside-repo' · ff09c9e5
      Junio C Hamano 提交于
      On a case-insensitive filesystem, we failed to compare the part of
      the path that is above the worktree directory in an absolute
      pathname, which has been corrected.
      
      * js/abspath-part-inside-repo:
        abspath_part_inside_repo: respect core.ignoreCase
      ff09c9e5
    • J
      Merge branch 'jt/namespaced-ls-refs-fix' · 9c96ab98
      Junio C Hamano 提交于
      Fix namespace support in protocol v2.
      
      * jt/namespaced-ls-refs-fix:
        ls-refs: filter refs using namespace-stripped name
      9c96ab98
    • J
      Merge branch 'ab/commit-graph-write-progress' · e5eac573
      Junio C Hamano 提交于
      The codepath to show progress meter while writing out commit-graph
      file has been improved.
      
      * ab/commit-graph-write-progress:
        commit-graph write: emit a percentage for all progress
        commit-graph write: add itermediate progress
        commit-graph write: remove empty line for readability
        commit-graph write: add more descriptive progress output
        commit-graph write: show progress for object search
        commit-graph write: more descriptive "writing out" output
        commit-graph write: add "Writing out" progress output
        commit-graph: don't call write_graph_chunk_extra_edges() unnecessarily
        commit-graph: rename "large edges" to "extra edges"
      e5eac573
    • J
      Merge branch 'ab/commit-graph-write-optim' · 04d67b6a
      Junio C Hamano 提交于
      The codepath to write out commit-graph has been optimized by
      following the usual pattern of visiting objects in in-pack order.
      
      * ab/commit-graph-write-optim:
        commit-graph write: use pack order when finding commits
      04d67b6a
    • J
      Merge branch 'js/t6042-timing-fix' · 3009c8bc
      Junio C Hamano 提交于
      Test update.
      
      * js/t6042-timing-fix:
        t6042: work around speed optimization on Windows
      3009c8bc
    • J
      Merge branch 'jk/add-ignore-errors-bit-assignment-fix' · 1c418243
      Junio C Hamano 提交于
      "git add --ignore-errors" did not work as advertised and instead
      worked as an unintended synonym for "git add --renormalize", which
      has been fixed.
      
      * jk/add-ignore-errors-bit-assignment-fix:
        add: use separate ADD_CACHE_RENORMALIZE flag
      1c418243
    • J
      Merge branch 'js/mingw-unc-path-w-backslashes' · f5dd9190
      Junio C Hamano 提交于
      In Git for Windows, "git clone \\server\share\path" etc. that uses
      UNC paths from command line had bad interaction with its shell
      emulation.
      
      * js/mingw-unc-path-w-backslashes:
        mingw: special-case arguments to `sh`
        mingw (t5580): document bug when cloning from backslashed UNC paths
      f5dd9190
    • J
      Merge branch 'cc/test-ref-store-typofix' · e91a1b1a
      Junio C Hamano 提交于
      An obvious typo in an assertion error message has been fixed.
      
      * cc/test-ref-store-typofix:
        helper/test-ref-store: fix "new-sha1" vs "old-sha1" typo
      e91a1b1a
    • J
      Merge branch 'jt/fetch-v2-sideband' · 5f8b86db
      Junio C Hamano 提交于
      "git fetch" and "git upload-pack" learned to send all exchange over
      the sideband channel while talking the v2 protocol.
      
      * jt/fetch-v2-sideband:
        tests: define GIT_TEST_SIDEBAND_ALL
        {fetch,upload}-pack: sideband v2 fetch response
        sideband: reverse its dependency on pkt-line
        pkt-line: introduce struct packet_writer
        pack-protocol.txt: accept error packets in any context
        Use packet_reader instead of packet_read_line
      5f8b86db
    • J
      Merge branch 'sg/obstack-cast-function-type-fix' · 33bea735
      Junio C Hamano 提交于
      The compat/obstack code had casts that -Wcast-function-type
      compilation option found questionable.
      
      * sg/obstack-cast-function-type-fix:
        compat/obstack: fix -Wcast-function-type warnings
      33bea735
    • J
      Merge branch 'js/commit-graph-chunk-table-fix' · 19a504d9
      Junio C Hamano 提交于
      The codepath to read from the commit-graph file attempted to read
      past the end of it when the file's table-of-contents was corrupt.
      
      * js/commit-graph-chunk-table-fix:
        Makefile: correct example fuzz build
        commit-graph: fix buffer read-overflow
        commit-graph, fuzz: add fuzzer for commit-graph
      19a504d9
    • J
      Merge branch 'ld/git-p4-shelve-update-fix' · 40b8ba2c
      Junio C Hamano 提交于
      "git p4" failed to update a shelved change when there were moved
      files, which has been corrected.
      
      * ld/git-p4-shelve-update-fix:
        git-p4: handle update of moved/copied files when updating a shelve
        git-p4: add failing test for shelved CL update involving move/copy
      40b8ba2c
    • J
      Merge branch 'jt/get-reference-with-commit-graph' · 09b2e409
      Junio C Hamano 提交于
      Micro-optimize the code that prepares commit objects to be walked
      by "git rev-list" when the commit-graph is available.
      
      * jt/get-reference-with-commit-graph:
        revision: use commit graph in get_reference()
      09b2e409
    • J
      Merge branch 'js/filter-options-should-use-plain-int' · 073312b4
      Junio C Hamano 提交于
      Update the protocol message specification to allow only the limited
      use of scaled quantities.  This is ensure potential compatibility
      issues will not go out of hand.
      
      * js/filter-options-should-use-plain-int:
        filter-options: expand scaled numbers
        tree:<depth>: skip some trees even when collecting omits
        list-objects-filter: teach tree:# how to handle >0
      073312b4
    • J
      Merge branch 'sb/more-repo-in-api' · b99a579f
      Junio C Hamano 提交于
      The in-core repository instances are passed through more codepaths.
      
      * sb/more-repo-in-api: (23 commits)
        t/helper/test-repository: celebrate independence from the_repository
        path.h: make REPO_GIT_PATH_FUNC repository agnostic
        commit: prepare free_commit_buffer and release_commit_memory for any repo
        commit-graph: convert remaining functions to handle any repo
        submodule: don't add submodule as odb for push
        submodule: use submodule repos for object lookup
        pretty: prepare format_commit_message to handle arbitrary repositories
        commit: prepare logmsg_reencode to handle arbitrary repositories
        commit: prepare repo_unuse_commit_buffer to handle any repo
        commit: prepare get_commit_buffer to handle any repo
        commit-reach: prepare in_merge_bases[_many] to handle any repo
        commit-reach: prepare get_merge_bases to handle any repo
        commit-reach.c: allow get_merge_bases_many_0 to handle any repo
        commit-reach.c: allow remove_redundant to handle any repo
        commit-reach.c: allow merge_bases_many to handle any repo
        commit-reach.c: allow paint_down_to_common to handle any repo
        commit: allow parse_commit* to handle any repo
        object: parse_object to honor its repository argument
        object-store: prepare has_{sha1, object}_file to handle any repo
        object-store: prepare read_object_file to deal with any repo
        ...
      b99a579f
  2. 30 1月, 2019 13 次提交
    • J
      Fourth batch after 2.20 · b5101f92
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      b5101f92
    • J
      Merge branch 'it/log-format-source' · a562a119
      Junio C Hamano 提交于
      Custom userformat "log --format" learned %S atom that stands for
      the tip the traversal reached the commit from, i.e. --source.
      
      * it/log-format-source:
        log: add %S option (like --source) to log --format
      a562a119
    • J
      Merge branch 'js/add-e-clear-patch-before-stating' · 7fa92ba4
      Junio C Hamano 提交于
      "git add -e" got confused when the change it wants to let the user
      edit is smaller than the previous change that was left over in a
      temporary file.
      
      * js/add-e-clear-patch-before-stating:
        add --edit: truncate the patch file
      7fa92ba4
    • J
      Merge branch 'bc/tree-walk-oid' · 371820d5
      Junio C Hamano 提交于
      The code to walk tree objects has been taught that we may be
      working with object names that are not computed with SHA-1.
      
      * bc/tree-walk-oid:
        cache: make oidcpy always copy GIT_MAX_RAWSZ bytes
        tree-walk: store object_id in a separate member
        match-trees: use hashcpy to splice trees
        match-trees: compute buffer offset correctly when splicing
        tree-walk: copy object ID before use
      371820d5
    • J
      Merge branch 'jt/upload-pack-deepen-relative-proto-v2' · a6e38399
      Junio C Hamano 提交于
      "git fetch --deepen=<more>" has been corrected to work over v2
      protocol.
      
      * jt/upload-pack-deepen-relative-proto-v2:
        upload-pack: teach deepen-relative in protocol v2
        fetch-pack: do not take shallow lock unnecessarily
      a6e38399
    • J
      Merge branch 'jk/remote-insteadof-cleanup' · 424a6658
      Junio C Hamano 提交于
      Code clean-up.
      
      * jk/remote-insteadof-cleanup:
        remote: check config validity before creating rewrite struct
      424a6658
    • J
      Merge branch 'ms/http-no-more-failonerror' · 99c0bdd0
      Junio C Hamano 提交于
      Debugging help for http transport.
      
      * ms/http-no-more-failonerror:
        test: test GIT_CURL_VERBOSE=1 shows an error
        remote-curl: unset CURLOPT_FAILONERROR
        remote-curl: define struct for CURLOPT_WRITEFUNCTION
        http: enable keep_error for HTTP requests
        http: support file handles for HTTP_KEEP_ERROR
      99c0bdd0
    • J
      Merge branch 'os/rebase-runs-post-checkout-hook' · d94ade7f
      Junio C Hamano 提交于
      "git rebase" internally runs "checkout" to switch between branches,
      and the command used to call the post-checkout hook, but the
      reimplementation stopped doing so, which is getting fixed.
      
      * os/rebase-runs-post-checkout-hook:
        rebase: run post-checkout hook on checkout
        t5403: simplify by using a single repository
      d94ade7f
    • J
      Merge branch 'bc/sha-256' · 33e4ae9c
      Junio C Hamano 提交于
      Add sha-256 hash and plug it through the code to allow building Git
      with the "NewHash".
      
      * bc/sha-256:
        hash: add an SHA-256 implementation using OpenSSL
        sha256: add an SHA-256 implementation using libgcrypt
        Add a base implementation of SHA-256 support
        commit-graph: convert to using the_hash_algo
        t/helper: add a test helper to compute hash speed
        sha1-file: add a constant for hash block size
        t: make the sha1 test-tool helper generic
        t: add basic tests for our SHA-1 implementation
        cache: make hashcmp and hasheq work with larger hashes
        hex: introduce functions to print arbitrary hashes
        sha1-file: provide functions to look up hash algorithms
        sha1-file: rename algorithm to "sha1"
      33e4ae9c
    • J
      Merge branch 'sb/submodule-recursive-fetch-gets-the-tip' · 5d3635db
      Junio C Hamano 提交于
      "git fetch --recurse-submodules" may not fetch the necessary commit
      that is bound to the superproject, which is getting corrected.
      
      * sb/submodule-recursive-fetch-gets-the-tip:
        fetch: ensure submodule objects fetched
        submodule.c: fetch in submodules git directory instead of in worktree
        submodule: migrate get_next_submodule to use repository structs
        repository: repo_submodule_init to take a submodule struct
        submodule: store OIDs in changed_submodule_names
        submodule.c: tighten scope of changed_submodule_names struct
        submodule.c: sort changed_submodule_names before searching it
        submodule.c: fix indentation
        sha1-array: provide oid_array_filter
      5d3635db
    • J
      Merge branch 'jt/fetch-pack-v2' · f3398946
      Junio C Hamano 提交于
      "git fetch-pack" now can talk the version 2 protocol.
      
      * jt/fetch-pack-v2:
        fetch-pack: support protocol version 2
      f3398946
    • J
      Merge branch 'jk/proto-v2-hidden-refs-fix' · d3b01782
      Junio C Hamano 提交于
      The v2 upload-pack protocol implementation failed to honor
      hidden-ref configuration, which has been corrected.
      An earlier attempt reverted out of 'next'.
      
      * jk/proto-v2-hidden-refs-fix:
        upload-pack: support hidden refs with protocol v2
      d3b01782
    • J
      Merge branch 'jk/save-getenv-result' · 773e4088
      Junio C Hamano 提交于
      There were many places the code relied on the string returned from
      getenv() to be non-volatile, which is not true, that have been
      corrected.
      
      * jk/save-getenv-result:
        builtin_diff(): read $GIT_DIFF_OPTS closer to use
        merge-recursive: copy $GITHEAD strings
        init: make a copy of $GIT_DIR string
        config: make a copy of $GIT_CONFIG string
        commit: copy saved getenv() result
        get_super_prefix(): copy getenv() result
      773e4088