1. 30 10月, 2018 24 次提交
    • J
      Merge branch 'ah/doc-updates' · 90d228b0
      Junio C Hamano 提交于
      Doc updates.
      
      * ah/doc-updates:
        doc: fix formatting in git-update-ref
        doc: fix indentation of listing blocks in gitweb.conf.txt
        doc: fix descripion for 'git tag --format'
        doc: fix inappropriate monospace formatting
        doc: fix ASCII art tab spacing
        doc: clarify boundaries of 'git worktree list --porcelain'
      90d228b0
    • J
      Merge branch 'ds/reachable' · f2d1c83d
      Junio C Hamano 提交于
      Trivial bugfix.
      
      * ds/reachable:
        commit-reach: fix cast in compare_commits_by_gen()
      f2d1c83d
    • J
      Merge branch 'jc/receive-deny-current-branch-fix' · 4c7f5440
      Junio C Hamano 提交于
      The receive.denyCurrentBranch=updateInstead codepath kicked in even
      when the push should have been rejected due to other reasons, such
      as it does not fast-forward or the update-hook rejects it, which
      has been corrected.
      
      * jc/receive-deny-current-branch-fix:
        receive: denyCurrentBranch=updateinstead should not blindly update
      4c7f5440
    • J
      Merge branch 'ds/ci-commit-graph-and-midx' · 5742ba50
      Junio C Hamano 提交于
      One of our CI tests to run with "unusual/experimental/random"
      settings now also uses commit-graph and midx.
      
      * ds/ci-commit-graph-and-midx:
        ci: add optional test variables
      5742ba50
    • J
      Merge branch 'jk/unused-function' · c5cde07a
      Junio C Hamano 提交于
      Developer support.
      
      * jk/unused-function:
        config.mak.dev: enable -Wunused-function
      c5cde07a
    • J
      Merge branch 'cb/remove-dead-init' · 48542e32
      Junio C Hamano 提交于
      Code clean-up.
      
      * cb/remove-dead-init:
        multi-pack-index: avoid dead store for struct progress
        unpack-trees: avoid dead store for struct progress
      48542e32
    • J
      Merge branch 'js/diff-notice-has-drive-prefix' · 99499e22
      Junio C Hamano 提交于
      Under certain circumstances, "git diff D:/a/b/c D:/a/b/d" on
      Windows would strip initial parts from the paths because they
      were not recognized as absolute, which has been corrected.
      
      * js/diff-notice-has-drive-prefix:
        diff: don't attempt to strip prefix from absolute Windows paths
      99499e22
    • J
      Merge branch 'ot/ref-filter-plug-leaks' · 9d00100c
      Junio C Hamano 提交于
      Plugging a handful of memory leaks in the ref-filter codepath.
      
      * ot/ref-filter-plug-leaks:
        ref-filter: free item->value and item->value->s
        ls-remote: release memory instead of UNLEAK
        ref-filter: free memory from used_atom
      9d00100c
    • J
      Merge branch 'ds/reachable-first-parent-fix' · 68fa2ebd
      Junio C Hamano 提交于
      Correct performance regression in commit ancestry computation when
      generation numbers are involved.
      
      * ds/reachable-first-parent-fix:
        commit-reach: fix first-parent heuristic
      68fa2ebd
    • J
      Merge branch 'rj/header-guards' · 0a1006c5
      Junio C Hamano 提交于
      Code clean-up.
      
      * rj/header-guards:
        headers: normalize the spelling of some header guards
      0a1006c5
    • J
      Merge branch 'jk/test-tool-help' · 11914675
      Junio C Hamano 提交于
      Developer support.
      
      * jk/test-tool-help:
        test-tool: show tool list on error
      11914675
    • J
      Merge branch 'sg/doc-show-branch-typofix' · 4b73fdae
      Junio C Hamano 提交于
      Docfix.
      
      * sg/doc-show-branch-typofix:
        doc: fix small typo in git show-branch
      4b73fdae
    • J
      Merge branch 'sb/submodule-helper-remove-cruft' · 7002cb97
      Junio C Hamano 提交于
      Code clean-up.
      
      * sb/submodule-helper-remove-cruft:
        builtin/submodule--helper: remove debugging leftover tracing
      7002cb97
    • J
      Merge branch 'js/pack-objects-mutex-init-fix' · 620b00e1
      Junio C Hamano 提交于
      A mutex used in "git pack-objects" were not correctly initialized
      and this caused "git repack" to dump core on Windows.
      
      * js/pack-objects-mutex-init-fix:
        pack-objects (mingw): initialize `packing_data` mutex in the correct spot
        pack-objects (mingw): demonstrate a segmentation fault with large deltas
        pack-objects: fix typo 'detla' -> 'delta'
      620b00e1
    • J
      Merge branch 'tq/branch-style-fix' · 6119b8de
      Junio C Hamano 提交于
      Code clean-up.
      
      * tq/branch-style-fix:
        branch: trivial style fix
      6119b8de
    • J
      Merge branch 'tq/branch-create-wo-branch-get' · d4591b97
      Junio C Hamano 提交于
      Code clean-up.
      
      * tq/branch-create-wo-branch-get:
        builtin/branch.c: remove useless branch_get
      d4591b97
    • J
      Merge branch 'bc/hash-transition-part-15' · d829d491
      Junio C Hamano 提交于
      More codepaths are moving away from hardcoded hash sizes.
      
      * bc/hash-transition-part-15:
        rerere: convert to use the_hash_algo
        submodule: make zero-oid comparison hash function agnostic
        apply: rename new_sha1_prefix and old_sha1_prefix
        apply: replace hard-coded constants
        tag: express constant in terms of the_hash_algo
        transport: use parse_oid_hex instead of a constant
        upload-pack: express constants in terms of the_hash_algo
        refs/packed-backend: express constants using the_hash_algo
        packfile: express constants in terms of the_hash_algo
        pack-revindex: express constants in terms of the_hash_algo
        builtin/fetch-pack: remove constants with parse_oid_hex
        builtin/mktree: remove hard-coded constant
        builtin/repack: replace hard-coded constants
        pack-bitmap-write: use GIT_MAX_RAWSZ for allocation
        object_id.cocci: match only expressions of type 'struct object_id'
      d829d491
    • J
      Merge branch 'sb/strbuf-h-update' · 7dc3e5a3
      Junio C Hamano 提交于
      Code clean-up to serve as a BCP example.
      
      * sb/strbuf-h-update:
        strbuf.h: format according to coding guidelines
      7dc3e5a3
    • J
      Merge branch 'jk/run-command-notdot' · 17809a98
      Junio C Hamano 提交于
      The implementation of run_command() API on the UNIX platforms had a
      bug that caused a command not on $PATH to be found in the current
      directory.
      
      * jk/run-command-notdot:
        run-command: mark path lookup errors with ENOENT
      17809a98
    • J
      Merge branch 'tb/filter-alternate-refs' · 107b9bad
      Junio C Hamano 提交于
      Test fix.
      
      * tb/filter-alternate-refs:
        t5410: use longer path for sample script
        Documentation/config.txt: fix typo in core.alternateRefsCommand
      107b9bad
    • J
      Merge branch 'rv/send-email-cc-misc-by' · 8a0d060f
      Junio C Hamano 提交于
      "git send-email" learned to grab address-looking string on any
      trailer whose name ends with "-by"; --suppress-cc=misc-by on the
      command line, or setting sendemail.suppresscc configuration
      variable to "misc-by", can be used to disable this behaviour.
      
      This is a backward-incompatible change that may surprise existing
      users.
      
      * rv/send-email-cc-misc-by:
        send-email: also pick up cc addresses from -by trailers
        send-email: only consider lines containing @ or <> for automatic Cc'ing
        Documentation/git-send-email.txt: style fixes
      8a0d060f
    • J
      Merge branch 'lm/range-diff-submodule-fix' · d450e564
      Junio C Hamano 提交于
      "git range-diff" did not work well when the compared ranges had
      changes in submodules and the "--submodule=log" was used.
      
      * lm/range-diff-submodule-fix:
        range-diff: allow to diff files regardless of submodule config
      d450e564
    • J
      Merge branch 'ch/subtree-build' · 42a165c9
      Junio C Hamano 提交于
      Build update for "git subtree" (in contrib/) documentation pages.
      
      * ch/subtree-build:
        Revert "subtree: make install targets depend on build targets"
        subtree: make install targets depend on build targets
        subtree: add build targets 'man' and 'html'
      42a165c9
    • J
      Merge branch 'md/filter-trees' · 77d50375
      Junio C Hamano 提交于
      The "rev-list --filter" feature learned to exclude all trees via
      "tree:0" filter.
      
      * md/filter-trees:
        list-objects: support for skipping tree traversal
        filter-trees: code clean-up of tests
        list-objects-filter: implement filter tree:0
        list-objects-filter-options: do not over-strbuf_init
        list-objects-filter: use BUG rather than die
        revision: mark non-user-given objects instead
        rev-list: handle missing tree objects properly
        list-objects: always parse trees gently
        list-objects: refactor to process_tree_contents
        list-objects: store common func args in struct
      77d50375
  2. 26 10月, 2018 16 次提交
    • J
      Sixth batch for 2.20 · c670b1f8
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      c670b1f8
    • J
      Merge branch 'js/mingw-default-ident' · 16ce0b92
      Junio C Hamano 提交于
      The logic to select the default user name and e-mail on Windows has
      been improved.
      
      * js/mingw-default-ident:
        mingw: use domain information for default email
        getpwuid(mingw): provide a better default for the user name
        getpwuid(mingw): initialize the structure only once
      16ce0b92
    • J
      Merge branch 'ld/p4-unshelve' · 1e5d4548
      Junio C Hamano 提交于
      "git p4 unshelve" improvements.
      
      * ld/p4-unshelve:
        git-p4: fully support unshelving changelists
        git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
        git-p4: do not fail in verbose mode for missing 'fileSize' key
      1e5d4548
    • J
      Merge branch 'du/cherry-is-plumbing' · eff5d693
      Junio C Hamano 提交于
      Doc update to mark "git cherry" as a plumbing command.
      
      * du/cherry-is-plumbing:
        doc: move git-cherry to plumbing
      eff5d693
    • J
      Merge branch 'ab/gc-doc-update' · 1fd2ffca
      Junio C Hamano 提交于
      The documentation of "git gc" has been updated to mention that it
      is no longer limited to "pruning away crufts" but also updates
      ancillary files like commit-graph as a part of repository
      optimization.
      
      * ab/gc-doc-update:
        gc doc: mention the commit-graph in the intro
      1fd2ffca
    • J
      Merge branch 'js/fuzzer' · 0c41b3b1
      Junio C Hamano 提交于
      An experiment to fuzz test a few areas, hopefully we can gain more
      coverage to various areas.
      
      * js/fuzzer:
        fuzz: add fuzz testing for packfile indices.
        fuzz: add basic fuzz testing target.
      0c41b3b1
    • J
      Merge branch 'rv/alias-help' · 7752999c
      Junio C Hamano 提交于
      "git cmd --help" when "cmd" is aliased used to only say "cmd is
      aliased to ...".  Now it shows that to the standard error stream
      and runs "git $cmd --help" where $cmd is the first word of the
      alias expansion.
      
      This could be misleading for those who alias a command with options
      (e.g. with "[alias] cpn = cherry-pick -n", "git cpn --help" would
      show the manual of "cherry-pick", and the reader would not be told
      to pay close attention to the part that describes the "--no-commit"
      option until closing the pager that showed the contents of the
      manual, if the pager is configured to restore the original screen,
      or would not be told at all, if the pager simply makes the message
      on the standard error scroll away.
      
      * rv/alias-help:
        git-help.txt: document "git help cmd" vs "git cmd --help" for aliases
        git.c: handle_alias: prepend alias info when first argument is -h
        help: redirect to aliased commands for "git cmd --help"
      7752999c
    • J
      Merge branch 'sb/diff-emit-line-ws-markup-cleanup' · d1f96fd8
      Junio C Hamano 提交于
      Code clean-up.
      
      * sb/diff-emit-line-ws-markup-cleanup:
        diff.c: pass sign_index to emit_line_ws_markup
      d1f96fd8
    • J
      Merge branch 'du/get-tar-commit-id-is-plumbing' · 46307e34
      Junio C Hamano 提交于
      Doc update to mark "git get-tar-commit-id" as a plumbing command.
      
      * du/get-tar-commit-id-is-plumbing:
        doc: move git-get-tar-commit-id to plumbing
      46307e34
    • J
      Merge branch 'mm/doc-no-dashed-git' · eed56667
      Junio C Hamano 提交于
      Doc update.
      
      * mm/doc-no-dashed-git:
        doc: fix a typo and clarify a sentence
      eed56667
    • J
      Merge branch 'du/rev-parse-is-plumbing' · 7db60837
      Junio C Hamano 提交于
      Doc update.
      
      * du/rev-parse-is-plumbing:
        doc: move git-rev-parse from porcelain to plumbing
      7db60837
    • J
      Merge branch 'np/log-graph-octopus-fix' · 0ffa31fc
      Junio C Hamano 提交于
      "git log --graph" showing an octopus merge sometimes miscounted the
      number of display columns it is consuming to show the merge and its
      parent commits, which has been corrected.
      
      * np/log-graph-octopus-fix:
        log: fix coloring of certain octopus merge shapes
      0ffa31fc
    • J
      Merge branch 'sg/split-index-racefix' · 7a43ab6f
      Junio C Hamano 提交于
      The codepath to support the experimental split-index mode had
      remaining "racily clean" issues fixed.
      
      * sg/split-index-racefix:
        split-index: BUG() when cache entry refers to non-existing shared entry
        split-index: smudge and add racily clean cache entries to split index
        split-index: don't compare cached data of entries already marked for split index
        split-index: count the number of deleted entries
        t1700-split-index: date back files to avoid racy situations
        split-index: add tests to demonstrate the racy split index problem
        t1700-split-index: document why FSMONITOR is disabled in this test script
      7a43ab6f
    • J
      Merge branch 'ds/coverage-diff' · 3c4a8214
      Junio C Hamano 提交于
      The result of coverage test can be combined with "git blame" to
      check the test coverage of code introduced recently with a new
      'coverage-diff' tool (in contrib/).
      
      * ds/coverage-diff:
        contrib: add coverage-diff script
      3c4a8214
    • J
      Merge branch 'bc/editorconfig' · 778bb5ea
      Junio C Hamano 提交于
      To help developers, an EditorConfig file that attempts to follow
      the project convention has been added.
      
      * bc/editorconfig:
        editorconfig: indicate settings should be kept in sync
        editorconfig: provide editor settings for Git developers
      778bb5ea
    • J
      Merge branch 'ma/t7005-bash-workaround' · f7661766
      Junio C Hamano 提交于
      Test fix.
      
      * ma/t7005-bash-workaround:
        t7005-editor: quote filename to fix whitespace-issue
      f7661766