1. 23 Aug, 2017 20 commits
    • Junio C Hamano's avatar
      Prepare for 2.14.2 · edc74bc7
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      edc74bc7
    • Junio C Hamano's avatar
      Merge branch 'jt/t1450-fsck-corrupt-packfile' into maint · 0f41b92c
      Junio C Hamano authored
      A test update.
      
      * jt/t1450-fsck-corrupt-packfile:
        tests: ensure fsck fails on corrupt packfiles
      0f41b92c
    • Junio C Hamano's avatar
      Merge branch 'jb/t8008-cleanup' into maint · 86bf8e45
      Junio C Hamano authored
      Code clean-up.
      
      * jb/t8008-cleanup:
        t8008: rely on rev-parse'd HEAD instead of sha1 value
      86bf8e45
    • Junio C Hamano's avatar
      Merge branch 'jt/subprocess-handshake' into maint · df2dd283
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'dc/fmt-merge-msg-microcleanup' into maint · de557036
      Junio C Hamano authored
      Code cleanup.
      
      * dc/fmt-merge-msg-microcleanup:
        fmt-merge-msg: fix coding style
      de557036
    • Junio C Hamano's avatar
      Merge branch 'ah/doc-wserrorhighlight' into maint · b55b9360
      Junio C Hamano authored
      Doc update.
      
      * ah/doc-wserrorhighlight:
        doc: add missing values "none" and "default" for diff.wsErrorHighlight
      b55b9360
    • Junio C Hamano's avatar
      Merge branch 'cc/ref-is-hidden-microcleanup' into maint · d0dffcac
      Junio C Hamano authored
      Code cleanup.
      
      * cc/ref-is-hidden-microcleanup:
        refs: use skip_prefix() in ref_is_hidden()
      d0dffcac
    • Junio C Hamano's avatar
      Merge branch 'js/run-process-parallel-api-fix' into maint · 08692770
      Junio C Hamano authored
      API fix.
      
      * js/run-process-parallel-api-fix:
        run_processes_parallel: change confusing task_cb convention
      08692770
    • Junio C Hamano's avatar
      Merge branch 'rs/pack-objects-pbase-cleanup' into maint · e22a48c4
      Junio C Hamano authored
      Code clean-up.
      
      * rs/pack-objects-pbase-cleanup:
        pack-objects: remove unnecessary NULL check
      e22a48c4
    • Junio C Hamano's avatar
      Merge branch 'jt/fsck-code-cleanup' into maint · 697f11b6
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'rs/stat-data-unaligned-reads-fix' into maint · 0d824bc7
      Junio C Hamano authored
      Code clean-up.
      
      * rs/stat-data-unaligned-reads-fix:
        dir: support platforms that require aligned reads
      0d824bc7
    • Junio C Hamano's avatar
      Merge branch 'rs/move-array' into maint · d3b7ee08
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'rs/bswap-ubsan-fix' into maint · 752732c6
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint · cdc55aad
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'hb/gitweb-project-list' into maint · b9e56be0
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'ks/commit-abort-on-empty-message-fix' into maint · 01ced489
      Junio C Hamano authored
      "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
    • Junio C Hamano's avatar
      Merge branch 'jk/reflog-walk' into maint · 0cb526e0
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maint · 72140a73
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'jk/ref-filter-colors' into maint · 447f80f5
      Junio C Hamano authored
      "%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
    • Junio C Hamano's avatar
      Merge branch 'js/git-gui-msgfmt-on-windows' into maint · f613b251
      Junio C Hamano authored
      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
  2. 04 Aug, 2017 5 commits
  3. 02 Aug, 2017 2 commits
  4. 01 Aug, 2017 6 commits
  5. 31 Jul, 2017 7 commits