1. 16 4月, 2019 3 次提交
  2. 20 3月, 2019 11 次提交
    • J
      The third batch · 041f5ea1
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      041f5ea1
    • J
      Merge branch 'br/commit-tree-parseopt' · 0c45fa32
      Junio C Hamano 提交于
      The command line parser of "git commit-tree" has been rewritten to
      use the parse-options API.
      
      * br/commit-tree-parseopt:
        commit-tree: utilize parse-options api
      0c45fa32
    • J
      Merge branch 'jk/config-type-color-ends-with-lf' · f6c75e39
      Junio C Hamano 提交于
      "git config --type=color ..." is meant to replace "git config --get-color"
      but there is a slight difference that wasn't documented, which is
      now fixed.
      
      * jk/config-type-color-ends-with-lf:
        config: document --type=color output is a complete line
      f6c75e39
    • J
      Merge branch 'ma/clear-repository-format' · 6b5688b7
      Junio C Hamano 提交于
      The setup code has been cleaned up to avoid leaks around the
      repository_format structure.
      
      * ma/clear-repository-format:
        setup: fix memory leaks with `struct repository_format`
        setup: free old value before setting `work_tree`
      6b5688b7
    • J
      Merge branch 'jk/virtual-objects-do-exist' · 83b13e28
      Junio C Hamano 提交于
      A recent update broke "is this object available to us?" check for
      well-known objects like an empty tree (which should yield "yes",
      even when there is no on-disk object for an empty tree), which has
      been corrected.
      
      * jk/virtual-objects-do-exist:
        rev-list: allow cached objects in existence check
      83b13e28
    • J
      Merge branch 'jk/no-sigpipe-during-network-transport' · 27cdbdd1
      Junio C Hamano 提交于
      On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX),
      the upload-pack that runs on the other end that hangs up after
      detecting an error could cause "git fetch" to die with a signal,
      which led to a flakey test.  "git fetch" now ignores SIGPIPE during
      the network portion of its operation (this is not a problem as we
      check the return status from our write(2)s).
      
      * jk/no-sigpipe-during-network-transport:
        fetch: ignore SIGPIPE during network operation
        fetch: avoid calling write_or_die()
      27cdbdd1
    • J
      Merge branch 'jk/fsck-doc' · ea327760
      Junio C Hamano 提交于
      "git fsck --connectivity-only" omits computation necessary to sift
      the objects that are not reachable from any of the refs into
      unreachable and dangling.  This is now enabled when dangling
      objects are requested (which is done by default, but can be
      overridden with the "--no-dangling" option).
      
      * jk/fsck-doc:
        fsck: always compute USED flags for unreachable objects
        doc/fsck: clarify --connectivity-only behavior
      ea327760
    • J
      Merge branch 'js/stress-test-ui-tweak' · 88255bba
      Junio C Hamano 提交于
      Dev support.
      
      * js/stress-test-ui-tweak:
        tests: introduce --stress-jobs=<N>
        tests: let --stress-limit=<N> imply --stress
      88255bba
    • J
      Merge branch 'js/rebase-orig-head-fix' · 9fbcc3d2
      Junio C Hamano 提交于
      "git rebase" that was reimplemented in C did not set ORIG_HEAD
      correctly, which has been corrected.
      
      * js/rebase-orig-head-fix:
        built-in rebase: set ORIG_HEAD just once, before the rebase
        built-in rebase: demonstrate that ORIG_HEAD is not set correctly
        built-in rebase: use the correct reflog when switching branches
        built-in rebase: no need to check out `onto` twice
      9fbcc3d2
    • J
      Merge branch 'jk/bisect-final-output' · 1b8f4dc5
      Junio C Hamano 提交于
      The final report from "git bisect" used to show the suspected
      culprit using a raw "diff-tree", with which there is no output for
      a merge commit.  This has been updated to use a more modern and
      human readable output that still is concise enough.
      
      * jk/bisect-final-output:
        bisect: make diff-tree output prettier
        bisect: fix internal diff-tree config loading
        bisect: use string arguments to feed internal diff-tree
      1b8f4dc5
    • J
      Merge branch 'ab/makefile-help-devs-more' · 3cef6769
      Junio C Hamano 提交于
      CFLAGS now can be tweaked when invoking Make while using
      DEVELOPER=YesPlease; this did not work well before.
      
      * ab/makefile-help-devs-more:
        Makefile: allow for combining DEVELOPER=1 and CFLAGS="..."
        Makefile: move the setting of *FLAGS closer to "include"
        Makefile: Move *_LIBS assignment into its own section
        Makefile: add/remove comments at top and tweak whitespace
        Makefile: move "strip" assignment down from flags
        Makefile: remove an out-of-date comment
      3cef6769
  3. 18 3月, 2019 1 次提交
  4. 14 3月, 2019 1 次提交
  5. 11 3月, 2019 11 次提交
  6. 08 3月, 2019 2 次提交
  7. 07 3月, 2019 11 次提交
    • J
      config: document --type=color output is a complete line · cd8e7593
      Jeff King 提交于
      Even though the newer "--type=color" option to "git config" is meant
      to be upward compatible with the traditional "--get-color" option,
      unlike the latter, its output is not an incomplete line that lack
      the LF at the end.  That makes it consistent with output of other
      types like "git config --type=bool".
      
      Document it, as it sometimes surprises unsuspecting users.
      Signed-off-by: NJeff King <peff@peff.net>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      cd8e7593
    • J
      Start 2.22 cycle · 6e0cc677
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      6e0cc677
    • J
      Merge branch 'jt/http-auth-proto-v2-fix' · c42c664a
      Junio C Hamano 提交于
      Unify RPC code for smart http in protocol v0/v1 and v2, which fixes
      a bug in the latter (lack of authentication retry) and generally
      improves the code base.
      
      * jt/http-auth-proto-v2-fix:
        remote-curl: use post_rpc() for protocol v2 also
        remote-curl: refactor reading into rpc_state's buf
        remote-curl: reduce scope of rpc_state.result
        remote-curl: reduce scope of rpc_state.stdin_preamble
        remote-curl: reduce scope of rpc_state.argv
      c42c664a
    • J
      Merge branch 'jk/diff-no-index-initialize' · 12e5bdd9
      Junio C Hamano 提交于
      "git diff --no-index" may still want to access Git goodies like
      --ext-diff and --textconv, but so far these have been ignored,
      which has been corrected.
      
      * jk/diff-no-index-initialize:
        diff: reuse diff setup for --no-index case
      12e5bdd9
    • J
      Merge branch 'nd/no-more-check-racy' · 68731c7e
      Junio C Hamano 提交于
      Unused code removal.
      
      * nd/no-more-check-racy:
        Delete check-racy.c
      68731c7e
    • J
      Merge branch 'rd/doc-hook-used-in-sample' · 1c6036b6
      Junio C Hamano 提交于
      Doc update.
      
      * rd/doc-hook-used-in-sample:
        mention use of "hooks.allownonascii" in "man githooks"
      1c6036b6
    • J
      Merge branch 'nd/diff-parseopt-2' · 4ab0f138
      Junio C Hamano 提交于
      Second batch to teach the diff machinery to use the parse-options
      API.
      
      * nd/diff-parseopt-2: (21 commits)
        diff-parseopt: convert --ignore-some-changes
        diff-parseopt: convert --[no-]minimal
        diff-parseopt: convert --relative
        diff-parseopt: convert --no-renames|--[no--rename-empty
        diff-parseopt: convert --find-copies-harder
        diff-parseopt: convert -C|--find-copies
        diff-parseopt: convert -D|--irreversible-delete
        diff-parseopt: convert -M|--find-renames
        diff-parseopt: convert -B|--break-rewrites
        diff-parseopt: convert --output-*
        diff-parseopt: convert --[no-]compact-summary
        diff-parseopt: convert --stat*
        diff-parseopt: convert -s|--no-patch
        diff-parseopt: convert --name-status
        diff-parseopt: convert --name-only
        diff-parseopt: convert --patch-with-stat
        diff-parseopt: convert --summary
        diff-parseopt: convert --check
        diff-parseopt: convert --dirstat and friends
        diff-parseopt: convert --numstat and --shortstat
        ...
      4ab0f138
    • J
      Merge branch 'en/merge-options-doc' · 082c15ad
      Junio C Hamano 提交于
      Doc update.
      
      * en/merge-options-doc:
        merge-options.txt: correct wording of --no-commit option
      082c15ad
    • J
      Merge branch 'nd/completion-more-parameters' · b0e7fb2e
      Junio C Hamano 提交于
      The command line completion (in contrib/) has been taught to
      complete more subcommand parameters.
      
      * nd/completion-more-parameters:
        completion: add more parameter value completion
      b0e7fb2e
    • J
      Merge branch 'ab/receive-pack-use-after-free-fix' · 4751a167
      Junio C Hamano 提交于
      Memfix.
      
      * ab/receive-pack-use-after-free-fix:
        receive-pack: fix use-after-free bug
      4751a167
    • J
      Merge branch 'dl/doc-submodule-wo-subcommand' · c388c12c
      Junio C Hamano 提交于
      Doc update.
      
      * dl/doc-submodule-wo-subcommand:
        submodule: document default behavior
      c388c12c