1. 27 8月, 2017 5 次提交
    • J
      Merge branch 'jt/stash-tests' · f6a47f9b
      Junio C Hamano 提交于
      Test update to improve coverage for "git stash" operations.
      
      * jt/stash-tests:
        stash: add a test for stashing in a detached state
        stash: add a test for when apply fails during stash branch
        stash: add a test for stash create with no files
      f6a47f9b
    • J
      Merge branch 'jk/trailers-parse' · 06cf4f2d
      Junio C Hamano 提交于
      "git interpret-trailers" has been taught a "--parse" and a few
      other options to make it easier for scripts to grab existing
      trailer lines from a commit log message.
      
      * jk/trailers-parse:
        doc/interpret-trailers: fix "the this" typo
        pretty: support normalization options for %(trailers)
        t4205: refactor %(trailers) tests
        pretty: move trailer formatting to trailer.c
        interpret-trailers: add --parse convenience option
        interpret-trailers: add an option to unfold values
        interpret-trailers: add an option to show only existing trailers
        interpret-trailers: add an option to show only the trailers
        trailer: put process_trailers() options into a struct
      06cf4f2d
    • J
      Merge branch 'pb/trailers-from-command-line' · bfd91b41
      Junio C Hamano 提交于
      "git interpret-trailers" learned to take the trailer specifications
      from the command line that overrides the configured values.
      
      * pb/trailers-from-command-line:
        interpret-trailers: fix documentation typo
        interpret-trailers: add options for actions
        trailers: introduce struct new_trailer_item
        trailers: export action enums and corresponding lookup functions
      bfd91b41
    • J
      Merge branch 'jt/diff-color-move-fix' · 0b963584
      Junio C Hamano 提交于
      A handful of bugfixes and an improvement to "diff --color-moved".
      
      * jt/diff-color-move-fix:
        diff: define block by number of alphanumeric chars
        diff: respect MIN_BLOCK_LENGTH for last block
        diff: avoid redundantly clearing a flag
      0b963584
    • J
      Merge branch 'sb/diff-color-move' · b6c4058f
      Junio C Hamano 提交于
      "git diff" has been taught to optionally paint new lines that are
      the same as deleted lines elsewhere differently from genuinely new
      lines.
      
      * sb/diff-color-move: (25 commits)
        diff: document the new --color-moved setting
        diff.c: add dimming to moved line detection
        diff.c: color moved lines differently, plain mode
        diff.c: color moved lines differently
        diff.c: buffer all output if asked to
        diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY
        diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEP
        diff.c: convert word diffing to use emit_diff_symbol
        diff.c: convert show_stats to use emit_diff_symbol
        diff.c: convert emit_binary_diff_body to use emit_diff_symbol
        submodule.c: migrate diff output to use emit_diff_symbol
        diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFF
        diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILES
        diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADER
        diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS}
        diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETE
        diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]
        diff.c: migrate emit_line_checked to use emit_diff_symbol
        diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOF
        diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFO
        ...
      b6c4058f
  2. 25 8月, 2017 8 次提交
    • J
      The fourth batch post 2.14 · 3dc57ebf
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      3dc57ebf
    • J
      Merge branch 'jk/doc-the-this' · 16e842bc
      Junio C Hamano 提交于
      Doc clean-up.
      
      * jk/doc-the-this:
        doc: fix typo in sendemail.identity
      16e842bc
    • J
      Merge branch 'rs/commit-h-single-parent-cleanup' · 985b2cfc
      Junio C Hamano 提交于
      Code clean-up.
      
      * rs/commit-h-single-parent-cleanup:
        commit: remove unused inline function single_parent()
      985b2cfc
    • J
      Merge branch 'jc/simplify-progress' · d33a4332
      Junio C Hamano 提交于
      The API to start showing progress meter after a short delay has
      been simplified.
      
      * jc/simplify-progress:
        progress: simplify "delayed" progress API
      d33a4332
    • J
      Merge branch 'tc/curl-with-backports' · 6ea13d88
      Junio C Hamano 提交于
      Updates to the HTTP layer we made recently unconditionally used
      features of libCurl without checking the existence of them, causing
      compilation errors, which has been fixed.  Also migrate the code to
      check feature macros, not version numbers, to cope better with
      libCurl that vendor ships with backported features.
      
      * tc/curl-with-backports:
        http: use a feature check to enable GSSAPI delegation control
        http: fix handling of missing CURLPROTO_*
      6ea13d88
    • J
      Merge branch 'cc/subprocess-handshake-missing-capabilities' · d1615f93
      Junio C Hamano 提交于
      When handshake with a subprocess filter notices that the process
      asked for an unknown capability, Git did not report what program
      the offending subprocess was running.  This has been corrected.
      
      * cc/subprocess-handshake-missing-capabilities:
        sub-process: print the cmd when a capability is unsupported
      d1615f93
    • J
      Merge branch 'rs/object-id' · 11bd9560
      Junio C Hamano 提交于
      Conversion from uchar[20] to struct object_id continues.
      
      * rs/object-id:
        tree-walk: convert fill_tree_descriptor() to object_id
      11bd9560
    • J
      Merge branch 'lg/merge-signoff' · bdfc15fb
      Junio C Hamano 提交于
      "git merge" learned a "--signoff" option to add the Signed-off-by:
      trailer with the committer's name.
      
      * lg/merge-signoff:
        merge: add a --signoff flag
      bdfc15fb
  3. 24 8月, 2017 27 次提交
    • J
      Sync with maint · 39566494
      Junio C Hamano 提交于
      * maint:
        Prepare for 2.14.2
      39566494
    • J
      Prepare for 2.14.2 · edc74bc7
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      edc74bc7
    • J
      Merge branch 'jt/t1450-fsck-corrupt-packfile' into maint · 0f41b92c
      Junio C Hamano 提交于
      A test update.
      
      * jt/t1450-fsck-corrupt-packfile:
        tests: ensure fsck fails on corrupt packfiles
      0f41b92c
    • J
      Merge branch 'jb/t8008-cleanup' into maint · 86bf8e45
      Junio C Hamano 提交于
      Code clean-up.
      
      * jb/t8008-cleanup:
        t8008: rely on rev-parse'd HEAD instead of sha1 value
      86bf8e45
    • J
      Merge branch 'jt/subprocess-handshake' into maint · df2dd283
      Junio C Hamano 提交于
      Code cleanup.
      
      * jt/subprocess-handshake:
        sub-process: refactor handshake to common function
        Documentation: migrate sub-process docs to header
        convert: add "status=delayed" to filter process protocol
        convert: refactor capabilities negotiation
        convert: move multiple file filter error handling to separate function
        convert: put the flags field before the flag itself for consistent style
        t0021: write "OUT <size>" only on success
        t0021: make debug log file name configurable
        t0021: keep filter log files on comparison
      df2dd283
    • J
      Merge branch 'dc/fmt-merge-msg-microcleanup' into maint · de557036
      Junio C Hamano 提交于
      Code cleanup.
      
      * dc/fmt-merge-msg-microcleanup:
        fmt-merge-msg: fix coding style
      de557036
    • J
      Merge branch 'ah/doc-wserrorhighlight' into maint · b55b9360
      Junio C Hamano 提交于
      Doc update.
      
      * ah/doc-wserrorhighlight:
        doc: add missing values "none" and "default" for diff.wsErrorHighlight
      b55b9360
    • J
      Merge branch 'cc/ref-is-hidden-microcleanup' into maint · d0dffcac
      Junio C Hamano 提交于
      Code cleanup.
      
      * cc/ref-is-hidden-microcleanup:
        refs: use skip_prefix() in ref_is_hidden()
      d0dffcac
    • J
      Merge branch 'js/run-process-parallel-api-fix' into maint · 08692770
      Junio C Hamano 提交于
      API fix.
      
      * js/run-process-parallel-api-fix:
        run_processes_parallel: change confusing task_cb convention
      08692770
    • J
      Merge branch 'rs/pack-objects-pbase-cleanup' into maint · e22a48c4
      Junio C Hamano 提交于
      Code clean-up.
      
      * rs/pack-objects-pbase-cleanup:
        pack-objects: remove unnecessary NULL check
      e22a48c4
    • J
      Merge branch 'jt/fsck-code-cleanup' into maint · 697f11b6
      Junio C Hamano 提交于
      Code clean-up.
      
      * jt/fsck-code-cleanup:
        fsck: cleanup unused variable
        object: remove "used" field from struct object
        fsck: remove redundant parse_tree() invocation
      697f11b6
    • J
      Merge branch 'rs/stat-data-unaligned-reads-fix' into maint · 0d824bc7
      Junio C Hamano 提交于
      Code clean-up.
      
      * rs/stat-data-unaligned-reads-fix:
        dir: support platforms that require aligned reads
      0d824bc7
    • J
      Merge branch 'rs/move-array' into maint · d3b7ee08
      Junio C Hamano 提交于
      Code clean-up.
      
      * rs/move-array:
        ls-files: don't try to prune an empty index
        apply: use COPY_ARRAY and MOVE_ARRAY in update_image()
        use MOVE_ARRAY
        add MOVE_ARRAY
      d3b7ee08
    • J
      Merge branch 'rs/bswap-ubsan-fix' into maint · 752732c6
      Junio C Hamano 提交于
      Code clean-up.
      
      * rs/bswap-ubsan-fix:
        bswap: convert get_be16, get_be32 and put_be32 to inline functions
        bswap: convert to unsigned before shifting in get_be32
      752732c6
    • J
      Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint · cdc55aad
      Junio C Hamano 提交于
      A recently added test for the "credential-cache" helper revealed
      that EOF detection done around the time the connection to the cache
      daemon is torn down were flaky.  This was fixed by reacting to
      ECONNRESET and behaving as if we got an EOF.
      
      * dl/credential-cache-socket-in-xdg-cache:
        credential-cache: interpret an ECONNRESET as an EOF
      cdc55aad
    • J
      Merge branch 'hb/gitweb-project-list' into maint · b9e56be0
      Junio C Hamano 提交于
      When a directory is not readable, "gitweb" fails to build the
      project list.  Work this around by skipping such a directory.
      
      It might end up hiding a problem under the rug and a better
      solution might be to loudly complain to the administrator pointing
      out the problematic directory, but this will at least make it
      "work".
      
      * hb/gitweb-project-list:
        gitweb: skip unreadable subdirectories
      b9e56be0
    • J
      Merge branch 'ks/commit-abort-on-empty-message-fix' into maint · 01ced489
      Junio C Hamano 提交于
      "git commit" when seeing an totally empty message said "you did not
      edit the message", which is clearly wrong.  The message has been
      corrected.
      
      * ks/commit-abort-on-empty-message-fix:
        commit: check for empty message before the check for untouched template
      01ced489
    • J
      Merge branch 'jk/reflog-walk' into maint · 0cb526e0
      Junio C Hamano 提交于
      Numerous bugs in walking of reflogs via "log -g" and friends have
      been fixed.
      
      * jk/reflog-walk:
        reflog-walk: apply --since/--until to reflog dates
        reflog-walk: stop using fake parents
        rev-list: check reflog_info before showing usage
        get_revision_1(): replace do-while with an early return
        log: do not free parents when walking reflog
        log: clarify comment about reflog cycles
        revision: disallow reflog walking with revs->limited
        t1414: document some reflog-walk oddities
      0cb526e0
    • J
      Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maint · 72140a73
      Junio C Hamano 提交于
      The http.{sslkey,sslCert} configuration variables are to be
      interpreted as a pathname that honors "~[username]/" prefix, but
      weren't, which has been fixed.
      
      * jc/http-sslkey-and-ssl-cert-are-paths:
        http.c: http.sslcert and http.sslkey are both pathnames
      72140a73
    • J
      Merge branch 'jk/ref-filter-colors' into maint · 447f80f5
      Junio C Hamano 提交于
      "%C(color name)" in the pretty print format always produced ANSI
      color escape codes, which was an early design mistake.  They now
      honor the configuration (e.g. "color.ui = never") and also tty-ness
      of the output medium.
      
      * jk/ref-filter-colors:
        ref-filter: consult want_color() before emitting colors
        pretty: respect color settings for %C placeholders
        rev-list: pass diffopt->use_colors through to pretty-print
        for-each-ref: load config earlier
        color: check color.ui in git_default_config()
        ref-filter: pass ref_format struct to atom parsers
        ref-filter: factor out the parsing of sorting atoms
        ref-filter: make parse_ref_filter_atom a private function
        ref-filter: provide a function for parsing sort options
        ref-filter: move need_color_reset_at_eol into ref_format
        ref-filter: abstract ref format into its own struct
        ref-filter: simplify automatic color reset
        t: use test_decode_color rather than literal ANSI codes
        docs/for-each-ref: update pointer to color syntax
        check return value of verify_ref_format()
      447f80f5
    • J
      Merge branch 'js/git-gui-msgfmt-on-windows' into maint · f613b251
      Junio C Hamano 提交于
      Because recent Git for Windows do come with a real msgfmt, the
      build procedure for git-gui has been updated to use it instead of a
      hand-rolled substitute.
      
      * js/git-gui-msgfmt-on-windows:
        git-gui (MinGW): make use of MSys2's msgfmt
        git gui: allow for a long recentrepo list
        git gui: de-dup selected repo from recentrepo history
        git gui: cope with duplicates in _get_recentrepo
        git-gui: remove duplicate entries from .gitconfig's gui.recentrepo
      f613b251
    • J
      The third batch post 2.14 · ab86f93d
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ab86f93d
    • J
      Merge branch 'mg/format-ref-doc-fix' · 883bac8f
      Junio C Hamano 提交于
      Doc fix.
      
      * mg/format-ref-doc-fix:
        Documentation/git-for-each-ref: clarify peeling of tags for --format
        Documentation: use proper wording for ref format strings
      883bac8f
    • J
      Merge branch 'sb/submodule-parallel-update' · 4add209e
      Junio C Hamano 提交于
      Code clean-up.
      
      * sb/submodule-parallel-update:
        submodule.sh: remove unused variable
      4add209e
    • J
      Merge branch 'jc/diff-sane-truncate-no-more' · 0f8472a4
      Junio C Hamano 提交于
      Code clean-up.
      
      * jc/diff-sane-truncate-no-more:
        diff: retire sane_truncate_fn
      0f8472a4
    • J
      Merge branch 'hv/t5526-andand-chain-fix' · 45121b9e
      Junio C Hamano 提交于
      Test fix.
      
      * hv/t5526-andand-chain-fix:
        t5526: fix some broken && chains
      45121b9e
    • J
      Merge branch 'as/grep-quiet-no-match-exit-code-fix' · 85c81a74
      Junio C Hamano 提交于
      "git grep -L" and "git grep --quiet -L" reported different exit
      codes; this has been corrected.
      
      * as/grep-quiet-no-match-exit-code-fix:
        git-grep: correct exit code with --quiet and -L
      85c81a74