1. 28 9月, 2017 12 次提交
    • J
      Merge branch 'ks/doc-use-camelcase-for-config-name' · 47d26f0a
      Junio C Hamano 提交于
      Doc update.
      
      * ks/doc-use-camelcase-for-config-name:
        doc: camelCase the config variables to improve readability
      47d26f0a
    • J
      Merge branch 'mk/diff-delta-avoid-large-offset' · fdbe2ac1
      Junio C Hamano 提交于
      The delta format used in the packfile cannot reference data at
      offset larger than what can be expressed in 4-byte, but the
      generator for the data failed to make sure the offset does not
      overflow.  This has been corrected.
      
      * mk/diff-delta-avoid-large-offset:
        diff-delta: do not allow delta offset truncation
      fdbe2ac1
    • J
      Merge branch 'mk/diff-delta-uint-may-be-shorter-than-ulong' · 3d09e79b
      Junio C Hamano 提交于
      The machinery to create xdelta used in pack files received the
      sizes of the data in size_t, but lost the higher bits of them by
      storing them in "unsigned int" during the computation, which is
      fixed.
      
      * mk/diff-delta-uint-may-be-shorter-than-ulong:
        diff-delta: fix encoding size that would not fit in "unsigned int"
      3d09e79b
    • J
      Merge branch 'rs/resolve-ref-optional-result' · 73ecdc60
      Junio C Hamano 提交于
      Code clean-up.
      
      * rs/resolve-ref-optional-result:
        refs: pass NULL to resolve_ref_unsafe() if hash is not needed
        refs: pass NULL to refs_resolve_ref_unsafe() if hash is not needed
        refs: make sha1 output parameter of refs_resolve_ref_unsafe() optional
      73ecdc60
    • J
      Merge branch 'rs/mailinfo-qp-decode-fix' · 2812ca7f
      Junio C Hamano 提交于
      "git mailinfo" was loose in decoding quoted printable and produced
      garbage when the two letters after the equal sign are not
      hexadecimal.  This has been fixed.
      
      * rs/mailinfo-qp-decode-fix:
        mailinfo: don't decode invalid =XY quoted-printable sequences
      2812ca7f
    • J
      Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' · 1ba75ffd
      Junio C Hamano 提交于
      A docfix.
      
      * jk/doc-read-tree-table-asciidoctor-fix:
        doc: put literal block delimiter around table
      1ba75ffd
    • J
      Merge branch 'ik/userdiff-html-h-element-fix' · 376a1da8
      Junio C Hamano 提交于
      The built-in pattern to detect the "function header" for HTML did
      not match <H1>..<H6> elements without any attributes, which has
      been fixed.
      
      * ik/userdiff-html-h-element-fix:
        userdiff: fix HTML hunk header regexp
      376a1da8
    • J
      Merge branch 'jk/fallthrough' · 59373a4e
      Junio C Hamano 提交于
      Many codepaths have been updated to squelch -Wimplicit-fallthrough
      warnings from Gcc 7 (which is a good code hygiene).
      
      * jk/fallthrough:
        consistently use "fallthrough" comments in switches
        curl_trace(): eliminate switch fallthrough
        test-line-buffer: simplify command parsing
      59373a4e
    • J
      Merge branch 'jk/diff-blob' · bfbc2fcc
      Junio C Hamano 提交于
      "git cat-file --textconv" started segfaulting recently, which
      has been corrected.
      
      * jk/diff-blob:
        cat-file: handle NULL object_context.path
      bfbc2fcc
    • J
      Merge branch 'hn/typofix' · 81746458
      Junio C Hamano 提交于
      * hn/typofix:
        submodule.h: typofix
      81746458
    • J
      Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger' · 386dd12b
      Junio C Hamano 提交于
      "git filter-branch" cannot reproduce a history with a tag without
      the tagger field, which only ancient versions of Git allowed to be
      created.  This has been corrected.
      
      * ic/fix-filter-branch-to-handle-tag-without-tagger:
        filter-branch: use hash-object instead of mktag
        filter-branch: stash away ref map in a branch
        filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_*
        filter-branch: reset $GIT_* before cleaning up
      386dd12b
    • J
      Merge branch 'jk/describe-omit-some-refs' · a515136c
      Junio C Hamano 提交于
      "git describe --match" learned to take multiple patterns in v2.13
      series, but the feature ignored the patterns after the first one
      and did not work at all.  This has been fixed.
      
      * jk/describe-omit-some-refs:
        describe: fix matching to actually match all patterns
      a515136c
  2. 26 9月, 2017 1 次提交
    • J
      Sync with 2.14.2 · 7451fcdc
      Junio C Hamano 提交于
      * maint:
        Git 2.14.2
        Git 2.13.6
        Git 2.12.5
        Git 2.11.4
        Git 2.10.5
        cvsimport: shell-quote variable used in backticks
        archimport: use safe_pipe_capture for user input
        shell: drop git-cvsserver support by default
        cvsserver: use safe_pipe_capture for `constant commands` as well
        cvsserver: use safe_pipe_capture instead of backticks
        cvsserver: move safe_pipe_capture() to the main package
      7451fcdc
  3. 25 9月, 2017 25 次提交
    • K
      doc: camelCase the config variables to improve readability · c3342b36
      Kaartic Sivaraam 提交于
      References to multi-word configuration variable names in our
      documentation must consistently use camelCase to highlight where
      the word boundaries are, even though these are treated case
      insensitively.
      
      Fix a few places that spell them in all lowercase, which makes
      them harder to read.
      Signed-off-by: NKaartic Sivaraam <kaarticsivaraam91196@gmail.com>
      Reviewed-by: NJonathan Nieder <jrnieder@gmail.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      c3342b36
    • J
      The ninth batch for 2.15 · 28996cec
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      28996cec
    • J
      Merge branch 'ks/test-readme-phrasofix' · 0d7bdad4
      Junio C Hamano 提交于
      Doc updates.
      
      * ks/test-readme-phrasofix:
        t/README: fix typo and grammatically improve a sentence
      0d7bdad4
    • J
      Merge branch 'ow/rev-parse-is-shallow-repo' · 3430fff7
      Junio C Hamano 提交于
      "git rev-parse" learned "--is-shallow-repository", that is to be
      used in a way similar to existing "--is-bare-repository" and
      friends.
      
      * ow/rev-parse-is-shallow-repo:
        rev-parse: rev-parse: add --is-shallow-repository
      3430fff7
    • J
      Merge branch 'rj/test-ulimit-on-windows' · 9709ffac
      Junio C Hamano 提交于
      On Cygwin, "ulimit -s" does not report failure but it does not work
      at all, which causes an unexpected success of some tests that
      expect failures under a limited stack situation.  This has been
      fixed.
      
      * rj/test-ulimit-on-windows:
        t9010-*.sh: skip all tests if the PIPE prereq is missing
        test-lib: use more compact expression in PIPE prerequisite
        test-lib: don't use ulimit in test prerequisites on cygwin
      9709ffac
    • J
      Merge branch 'jk/info-alternates-fix' · f759c873
      Junio C Hamano 提交于
      A regression fix for 2.11 that made the code to read the list of
      alternate object stores overrun the end of the string.
      
      * jk/info-alternates-fix:
        read_info_alternates: warn on non-trivial errors
        read_info_alternates: read contents into strbuf
      f759c873
    • J
      Merge branch 'mh/for-each-string-list-item-empty-fix' · 48f1e49b
      Junio C Hamano 提交于
      Code cmp.std.c nitpick.
      
      * mh/for-each-string-list-item-empty-fix:
        for_each_string_list_item: avoid undefined behavior for empty list
      48f1e49b
    • J
      Merge branch 'tb/test-lint-echo-e' · 6b05e611
      Junio C Hamano 提交于
      The test linter has been taught that we do not like "echo -e".
      
      * tb/test-lint-echo-e:
        test-lint: echo -e (or -E) is not portable
      6b05e611
    • J
      Merge branch 'jk/revision-remove-cmdline-pathspec' · 2bab096e
      Junio C Hamano 提交于
      Code clean-up that also plugs memory leaks.
      
      * jk/revision-remove-cmdline-pathspec:
        pathspec doc: parse_pathspec does not maintain references to args
        revision: replace "struct cmdline_pathspec" with argv_array
      2bab096e
    • J
      Merge branch 'ls/travis-scriptify' · f05a23ae
      Junio C Hamano 提交于
      The scripts to drive TravisCI has been reorganized and then an
      optimization to avoid spending cycles on a branch whose tip is
      tagged has been implemented.
      
      * ls/travis-scriptify:
        travis-ci: fix "skip_branch_tip_with_tag()" string comparison
        travis: dedent a few scripts that are indented overly deeply
        travis-ci: skip a branch build if equal tag is present
        travis-ci: move Travis CI code into dedicated scripts
      f05a23ae
    • J
      Merge branch 'aw/gc-lockfile-fscanf-fix' · abdf7d8e
      Junio C Hamano 提交于
      "git gc" tries to avoid running two instances at the same time by
      reading and writing pid/host from and to a lock file; it used to
      use an incorrect fscanf() format when reading, which has been
      corrected.
      
      * aw/gc-lockfile-fscanf-fix:
        gc: call fscanf() with %<len>s, not %<len>c, when reading hostname
      abdf7d8e
    • J
      Merge branch 'hv/mv-nested-submodules-test' · 450b9086
      Junio C Hamano 提交于
      A test to demonstrate "git mv" failing to adjust nested submodules
      has been added.
      
      * hv/mv-nested-submodules-test:
        add test for bug in git-mv for recursive submodules
      450b9086
    • J
      Merge branch 'bw/git-clang-format' · a36f631a
      Junio C Hamano 提交于
      "make style" runs git-clang-format to help developers by pointing
      out coding style issues.
      
      * bw/git-clang-format:
        Makefile: add style build rule
        clang-format: outline the git project's coding style
      a36f631a
    • J
      Merge branch 'nm/imap-send-with-curl' · b67f154b
      Junio C Hamano 提交于
      "git imap-send" has our own implementation of the protocol and also
      can use more recent libCurl with the imap protocol support.  Update
      the latter so that it can use the credential subsystem, and then
      make it the default option to use, so that we can eventually
      deprecate and remove the former.
      
      * nm/imap-send-with-curl:
        imap-send: use curl by default when possible
        imap_send: setup_curl: retreive credentials if not set in config file
        imap-send: add wrapper to get server credentials if needed
        imap-send: return with error if curl failed
      b67f154b
    • J
      Merge branch 'ks/commit-do-not-touch-cut-line' · 77f45395
      Junio C Hamano 提交于
      The explanation of the cut-line in the commit log editor has been
      slightly tweaked.
      
      * ks/commit-do-not-touch-cut-line:
        commit-template: change a message to be more intuitive
      77f45395
    • J
      Merge branch 'tg/refs-allowed-flags' · d0190105
      Junio C Hamano 提交于
      API error-proofing which happens to also squelch warnings from GCC.
      
      * tg/refs-allowed-flags:
        refs: strip out not allowed flags from ref_transaction_update
      d0190105
    • J
      Merge branch 'rs/archive-excluded-directory' · 62b1cb7b
      Junio C Hamano 提交于
      "git archive", especially when used with pathspec, stored an empty
      directory in its output, even though Git itself never does so.
      This has been fixed.
      
      * rs/archive-excluded-directory:
        archive: don't add empty directories to archives
      62b1cb7b
    • J
      Merge branch 'ks/help-alias-label' · 5079cc82
      Junio C Hamano 提交于
      "git help co" now says "co is aliased to ...", not "git co is".
      
      * ks/help-alias-label:
        help: change a message to be more precise
      5079cc82
    • J
      Merge branch 'jn/per-repo-object-store-fixes' · ceb7a01a
      Junio C Hamano 提交于
      Step #0 of a planned & larger series to make the in-core object
      store per in-core repository object.
      
      * jn/per-repo-object-store-fixes:
        replace-objects: evaluate replacement refs without using the object store
        push, fetch: error out for submodule entries not pointing to commits
        pack: make packed_git_mru global a value instead of a pointer
      ceb7a01a
    • J
      Merge branch 'jk/write-in-full-fix' · c50424a6
      Junio C Hamano 提交于
      Many codepaths did not diagnose write failures correctly when disks
      go full, due to their misuse of write_in_full() helper function,
      which have been corrected.
      
      * jk/write-in-full-fix:
        read_pack_header: handle signed/unsigned comparison in read result
        config: flip return value of store_write_*()
        notes-merge: use ssize_t for write_in_full() return value
        pkt-line: check write_in_full() errors against "< 0"
        convert less-trivial versions of "write_in_full() != len"
        avoid "write_in_full(fd, buf, len) != len" pattern
        get-tar-commit-id: check write_in_full() return against 0
        config: avoid "write_in_full(fd, buf, len) < len" pattern
      c50424a6
    • J
      Merge branch 'ez/doc-duplicated-words-fix' · 94982b69
      Junio C Hamano 提交于
      Typofix.
      
      * ez/doc-duplicated-words-fix:
        doc: fix minor typos (extra/duplicated words)
      94982b69
    • J
      Merge branch 'kd/doc-for-each-ref' · f5faef85
      Junio C Hamano 提交于
      Doc update.
      
      * kd/doc-for-each-ref:
        doc/for-each-ref: explicitly specify option names
        doc/for-each-ref: consistently use '=' to between argument names and values
      f5faef85
    • J
      Merge branch 'cc/subprocess-handshake-missing-capabilities' · b9db14f5
      Junio C Hamano 提交于
      Finishing touches to a topic already in 'master'.
      
      * cc/subprocess-handshake-missing-capabilities:
        subprocess: loudly die when subprocess asks for an unsupported capability
      b9db14f5
    • J
      Merge branch 'kw/write-index-reduce-alloc' · d085f977
      Junio C Hamano 提交于
      A hotfix to a topic already in 'master'.
      
      * kw/write-index-reduce-alloc:
        read-cache: fix index corruption with index v4
        Add t/helper/test-write-cache to .gitignore
      d085f977
    • J
      Merge branch 'mg/name-rev-tests-with-short-stack' · b0df15a1
      Junio C Hamano 提交于
      A handful of tests to demonstrates a recursive implementation of
      "name-rev" hurts.
      
      * mg/name-rev-tests-with-short-stack:
        t6120: test describe and name-rev with deep repos
        t6120: clean up state after breaking repo
        t6120: test name-rev --all and --stdin
        t7004: move limited stack prereq to test-lib
      b0df15a1
  4. 24 9月, 2017 2 次提交