Skip to content
Permalink
Branch: master
Commits on Mar 18, 2019
  1. Merge git://ozlabs.org/~paulus/gitk

    gitster committed Mar 18, 2019
    * git://ozlabs.org/~paulus/gitk:
      gitk: Update Bulgarian translation (317t)
Commits on Mar 14, 2019
  1. gitk: Update Bulgarian translation (317t)

    alshopov authored and Paul Mackerras committed Mar 13, 2019
    Signed-off-by: Alexander Shopov <ash@kambanaria.org>
    Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Commits on Mar 11, 2019
  1. The second batch

    gitster committed Mar 11, 2019
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Sync with maint

    gitster committed Mar 11, 2019
    * maint:
      mingw: allow building with an MSYS2 runtime v3.x
  3. Merge branch 'js/rebase-recreate-merge'

    gitster committed Mar 11, 2019
    Docfix.
    
    * js/rebase-recreate-merge:
      rebase docs: fix "gitlink" typo
  4. Merge branch 'js/untravis-windows'

    gitster committed Mar 11, 2019
    Dev support.
    
    * js/untravis-windows:
      travis: remove the hack to build the Windows job on Azure Pipelines
  5. Merge branch 'rd/gc-prune-doc-fix'

    gitster committed Mar 11, 2019
    Doxfix.
    
    * rd/gc-prune-doc-fix:
      docs/git-gc: fix typo "--prune=all" to "--prune=now"
  6. Merge branch 'js/find-lib-h-with-ls-files-when-possible'

    gitster committed Mar 11, 2019
    The Makefile uses 'find' utility to enumerate all the *.h header
    files, which is expensive on platforms with slow filesystems; it
    now optionally uses "ls-files" if working within a repository,
    which is a trick similar to how all sources are enumerated to run
    ETAGS on.
    
    * js/find-lib-h-with-ls-files-when-possible:
      Makefile: use `git ls-files` to list header files, if possible
  7. Merge branch 'rj/hdr-check-gcrypt-fix'

    gitster committed Mar 11, 2019
    The set of header files used by "make hdr-check" unconditionally
    included sha256/gcrypt.h, even when it is not used, causing the
    make target to fail.  We now skip it when GCRYPT_SHA256 is not in
    use.
    
    * rj/hdr-check-gcrypt-fix:
      Makefile: fix 'hdr-check' when GCRYPT not installed
  8. Merge branch 'jk/guard-bswap-header'

    gitster committed Mar 11, 2019
    The include file compat/bswap.h has been updated so that it is safe
    to (accidentally) include it more than once.
    
    * jk/guard-bswap-header:
      compat/bswap: add include header guards
  9. Merge branch 'rd/attr.c-comment-typofix'

    gitster committed Mar 11, 2019
    In-code comment typofix.
    
    * rd/attr.c-comment-typofix:
      attr.c: ".gitattribute" -> ".gitattributes" (comments)
  10. Merge branch 'yb/utf-16le-bom-spellfix'

    gitster committed Mar 11, 2019
    Doc update.
    
    * yb/utf-16le-bom-spellfix:
      gitattributes.txt: fix typo
  11. mingw: allow building with an MSYS2 runtime v3.x

    dscho authored and gitster committed Mar 8, 2019
    Recently the Git for Windows project started the upgrade process to
    a MSYS2 runtime version based on Cygwin v3.x.
    
    This has the very notable consequence that `$(uname -r)` no longer
    reports a version starting with "2", but a version with "3".
    
    That breaks our build, as df5218b (config.mak.uname: support MSys2,
    2016-01-13) simply did not expect the version reported by `uname -r` to
    depend on the underlying Cygwin version: it expected the reported
    version to match the "2" in "MSYS2".
    
    So let's invert that test case to test for *anything else* than a
    version starting with "1" (for MSys). That should safeguard us for the
    future, even if Cygwin ends up releasing versionsl like 314.272.65536.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 8, 2019
  1. mingw: drop MakeMaker reference

    dscho authored and gitster committed Feb 25, 2019
    In 20d2a30 (Makefile: replace perl/Makefile.PL with simple make
    rules, 2017-12-10), Git stopped using MakeMaker. Therefore, that
    definition in the MINGW-specific section became useless.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 7, 2019
  1. Start 2.22 cycle

    gitster committed Mar 7, 2019
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jt/http-auth-proto-v2-fix'

    gitster committed Mar 7, 2019
    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
  3. Merge branch 'jk/diff-no-index-initialize'

    gitster committed Mar 7, 2019
    "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
  4. Merge branch 'nd/no-more-check-racy'

    gitster committed Mar 7, 2019
    Unused code removal.
    
    * nd/no-more-check-racy:
      Delete check-racy.c
  5. Merge branch 'rd/doc-hook-used-in-sample'

    gitster committed Mar 7, 2019
    Doc update.
    
    * rd/doc-hook-used-in-sample:
      mention use of "hooks.allownonascii" in "man githooks"
  6. Merge branch 'nd/diff-parseopt-2'

    gitster committed Mar 7, 2019
    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
      ...
  7. Merge branch 'en/merge-options-doc'

    gitster committed Mar 7, 2019
    Doc update.
    
    * en/merge-options-doc:
      merge-options.txt: correct wording of --no-commit option
  8. Merge branch 'nd/completion-more-parameters'

    gitster committed Mar 7, 2019
    The command line completion (in contrib/) has been taught to
    complete more subcommand parameters.
    
    * nd/completion-more-parameters:
      completion: add more parameter value completion
  9. Merge branch 'ab/receive-pack-use-after-free-fix'

    gitster committed Mar 7, 2019
    Memfix.
    
    * ab/receive-pack-use-after-free-fix:
      receive-pack: fix use-after-free bug
  10. Merge branch 'dl/doc-submodule-wo-subcommand'

    gitster committed Mar 7, 2019
    Doc update.
    
    * dl/doc-submodule-wo-subcommand:
      submodule: document default behavior
  11. Merge branch 'jk/unused-params'

    gitster committed Mar 7, 2019
    Code clean-up.
    
    * jk/unused-params:
      ref-filter: drop unused "sz" parameters
      ref-filter: drop unused "obj" parameters
      ref-filter: drop unused buf/sz pairs
      files-backend: drop refs parameter from split_symref_update()
      pack-objects: drop unused parameter from oe_map_new_pack()
      merge-recursive: drop several unused parameters
      diff: drop complete_rewrite parameter from run_external_diff()
      diff: drop unused emit data parameter from sane_truncate_line()
      diff: drop unused color reset parameters
      diff: drop options parameter from diffcore_fix_diff_index()
  12. Merge branch 'jk/prune-optim'

    gitster committed Mar 7, 2019
    "git prune" has been taught to take advantage of reachability
    bitmap when able.
    
    * jk/prune-optim:
      t5304: rename "sha1" variables to "oid"
      prune: check SEEN flag for reachability
      prune: use bitmaps for reachability traversal
      prune: lazily perform reachability traversal
  13. Merge branch 'jh/trace2'

    gitster committed Mar 7, 2019
    A more structured way to obtain execution trace has been added.
    
    * jh/trace2:
      trace2: add for_each macros to clang-format
      trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
      trace2:data: add subverb for rebase
      trace2:data: add subverb to reset command
      trace2:data: add subverb to checkout command
      trace2:data: pack-objects: add trace2 regions
      trace2:data: add trace2 instrumentation to index read/write
      trace2:data: add trace2 hook classification
      trace2:data: add trace2 transport child classification
      trace2:data: add trace2 sub-process classification
      trace2:data: add editor/pager child classification
      trace2:data: add trace2 regions to wt-status
      trace2: collect Windows-specific process information
      trace2: create new combined trace facility
      trace2: Documentation/technical/api-trace2.txt
  14. Merge branch 'js/doc-symref-in-proto-v1'

    gitster committed Mar 7, 2019
    Doc update.
    
    * js/doc-symref-in-proto-v1:
      protocol-capabilities.txt: document symref
  15. Merge branch 'nd/split-index-null-base-fix'

    gitster committed Mar 7, 2019
    Split-index fix.
    
    * nd/split-index-null-base-fix:
      read-cache.c: fix writing "link" index ext with null base oid
  16. Merge branch 'rj/prune-packed-excess-args'

    gitster committed Mar 7, 2019
    "git prune-packed" did not notice and complain against excess
    arguments given from the command line, which now it does.
    
    * rj/prune-packed-excess-args:
      prune-packed: check for too many arguments
  17. Merge branch 'jc/test-yes-doc'

    gitster committed Mar 7, 2019
    Test doc update.
    
    * jc/test-yes-doc:
      test: caution on our version of 'yes'
  18. Merge branch 'en/combined-all-paths'

    gitster committed Mar 7, 2019
    Output from "diff --cc" did not show the original paths when the
    merge involved renames.  A new option adds the paths in the
    original trees to the output.
    
    * en/combined-all-paths:
      log,diff-tree: add --combined-all-paths option
  19. Merge branch 'sc/pack-redundant'

    gitster committed Mar 7, 2019
    Update the implementation of pack-redundant for performance in a
    repository with many packfiles.
    
    * sc/pack-redundant:
      pack-redundant: consistent sort method
      pack-redundant: rename pack_list.all_objects
      pack-redundant: new algorithm to find min packs
      pack-redundant: delete redundant code
      pack-redundant: delay creation of unique_objects
      t5323: test cases for git-pack-redundant
  20. Merge branch 'du/branch-show-current'

    gitster committed Mar 7, 2019
    "git branch" learned a new subcommand "--show-current".
    
    * du/branch-show-current:
      branch: introduce --show-current display option
  21. Merge branch 'dl/complete-submodule-absorbgitdirs'

    gitster committed Mar 7, 2019
    Command-line completion (in contrib/) learned to tab-complete the
    "git submodule absorbgitdirs" subcommand.
    
    * dl/complete-submodule-absorbgitdirs:
      completion: complete git submodule absorbgitdirs
Older
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.