Permalink
Commits on Feb 21, 2018
  1. Fourth batch for 2.17

    gitster committed Feb 21, 2018
  2. Merge branch 'sg/test-i18ngrep'

    gitster committed Feb 21, 2018
    Test fixes.
    
    * sg/test-i18ngrep:
      t: make 'test_i18ngrep' more informative on failure
      t: validate 'test_i18ngrep's parameters
      t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'
      t5536: let 'test_i18ngrep' read the file without redirection
      t5510: consolidate 'grep' and 'test_i18ngrep' patterns
      t4001: don't run 'git status' upstream of a pipe
      t6022: don't run 'git merge' upstream of a pipe
      t5812: add 'test_i18ngrep's missing filename parameter
      t5541: add 'test_i18ngrep's missing filename parameter
  3. Merge branch 'gs/rebase-allow-empty-message'

    gitster committed Feb 21, 2018
    "git rebase" learned to take "--allow-empty-message" option.
    
    * gs/rebase-allow-empty-message:
      rebase: add --allow-empty-message option
  4. Merge branch 'lw/daemon-log-destination'

    gitster committed Feb 21, 2018
    The log from "git daemon" can be redirected with a new option; one
    relevant use case is to send the log to standard error (instead of
    syslog) when running it from inetd.
    
    * lw/daemon-log-destination:
      daemon: add --log-destination=(stderr|syslog|none)
  5. Merge branch 'nd/format-patch-stat-width'

    gitster committed Feb 21, 2018
    "git format-patch" learned to give 72-cols to diffstat, which is
    consistent with other line length limits the subcommand uses for
    its output meant for e-mails.
    
    * nd/format-patch-stat-width:
      format-patch: reduce patch diffstat width to 72
      format-patch: keep cover-letter diffstat wrapped in 72 columns
Commits on Feb 15, 2018
  1. Sync with 2.16.2

    gitster committed Feb 15, 2018
    * tag 'v2.16.2':
      Git 2.16.2
  2. Git 2.16.2

    gitster committed Feb 15, 2018
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maint

    gitster committed Feb 15, 2018
    Doc update.
    
    * ab/doc-cat-file-e-still-shows-errors:
      cat-file doc: document that -e will return some output
  4. Merge branch 'as/read-tree-prefix-doc-fix' into maint

    gitster committed Feb 15, 2018
    Doc update.
    
    * as/read-tree-prefix-doc-fix:
      doc/read-tree: remove obsolete remark
  5. Merge branch 'nd/add-i-ignore-submodules' into maint

    gitster committed Feb 15, 2018
    "git add -p" was taught to ignore local changes to submodules as
    they do not interfere with the partial addition of regular changes
    anyway.
    
    * nd/add-i-ignore-submodules:
      add--interactive: ignore submodule changes except HEAD
  6. Merge branch 'tg/stash-with-pathspec-fix' into maint

    gitster committed Feb 15, 2018
    "git stash -- <pathspec>" incorrectly blew away untracked files in
    the directory that matched the pathspec, which has been corrected.
    
    * tg/stash-with-pathspec-fix:
      stash: don't delete untracked files that match pathspec
  7. Merge branch 'jk/abort-clone-with-existing-dest' into maint

    gitster committed Feb 15, 2018
    "git clone $there $here" is allowed even when here directory exists
    as long as it is an empty directory, but the command incorrectly
    removed it upon a failure of the operation.
    
    * jk/abort-clone-with-existing-dest:
      clone: do not clean up directories we didn't create
      clone: factor out dir_exists() helper
      t5600: modernize style
      t5600: fix outdated comment about unborn HEAD
  8. Merge branch 'jc/merge-symlink-ours-theirs' into maint

    gitster committed Feb 15, 2018
    "git merge -Xours/-Xtheirs" learned to use our/their version when
    resolving a conflicting updates to a symbolic link.
    
    * jc/merge-symlink-ours-theirs:
      merge: teach -Xours/-Xtheirs to symbolic link merge
  9. Merge branch 'rs/lose-leak-pending' into maint

    gitster committed Feb 15, 2018
    API clean-up around revision traversal.
    
    * rs/lose-leak-pending:
      commit: remove unused function clear_commit_marks_for_object_array()
      revision: remove the unused flag leak_pending
      checkout: avoid using the rev_info flag leak_pending
      bundle: avoid using the rev_info flag leak_pending
      bisect: avoid using the rev_info flag leak_pending
      object: add clear_commit_marks_all()
      ref-filter: use clear_commit_marks_many() in do_merge_filter()
      commit: use clear_commit_marks_many() in remove_redundant()
      commit: avoid allocation in clear_commit_marks_many()
  10. Merge branch 'jm/svn-pushmergeinfo-fix' into maint

    gitster committed Feb 15, 2018
    "git svn dcommit" did not take into account the fact that a
    svn+ssh:// URL with a username@ (typically used for pushing) refers
    to the same SVN repository without the username@ and failed when
    svn.pushmergeinfo option is set.
    
    * jm/svn-pushmergeinfo-fix:
      git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.
  11. Merge branch 'dk/describe-all-output-fix' into maint

    gitster committed Feb 15, 2018
    An old regression in "git describe --all $annotated_tag^0" has been
    fixed.
    
    * dk/describe-all-output-fix:
      describe: prepend "tags/" when describing tags with embedded name
  12. Merge branch 'ab/perf-grep-threads' into maint

    gitster committed Feb 15, 2018
    More perf tests for threaded grep
    
    * ab/perf-grep-threads:
      perf: amend the grep tests to test grep.threads
  13. Third batch for 2.17

    gitster committed Feb 15, 2018
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. Merge branch 'bc/hash-algo'

    gitster committed Feb 15, 2018
    More abstraction of hash function from the codepath.
    
    * bc/hash-algo:
      hash: update obsolete reference to SHA1_HEADER
      bulk-checkin: abstract SHA-1 usage
      csum-file: abstract uses of SHA-1
      csum-file: rename sha1file to hashfile
      read-cache: abstract away uses of SHA-1
      pack-write: switch various SHA-1 values to abstract forms
      pack-check: convert various uses of SHA-1 to abstract forms
      fast-import: switch various uses of SHA-1 to the_hash_algo
      sha1_file: switch uses of SHA-1 to the_hash_algo
      builtin/unpack-objects: switch uses of SHA-1 to the_hash_algo
      builtin/index-pack: improve hash function abstraction
      hash: create union for hash context allocation
      hash: move SHA-1 macros to hash.h
  15. Merge branch 'nd/ignore-glob-doc-update'

    gitster committed Feb 15, 2018
    Doc update.
    
    * nd/ignore-glob-doc-update:
      gitignore.txt: elaborate shell glob syntax
  16. Merge branch 'tg/reset-hard-show-head-with-pretty'

    gitster committed Feb 15, 2018
    The way "git reset --hard" reports the commit the updated HEAD
    points at is made consistent with the way how the commit title is
    generated by the other parts of the system.  This matters when the
    title is spread across physically multiple lines.
    
    * tg/reset-hard-show-head-with-pretty:
      reset --hard: make use of the pretty machinery
  17. Merge branch 'rs/cocci-strbuf-addf-to-addstr'

    gitster committed Feb 15, 2018
    * rs/cocci-strbuf-addf-to-addstr:
      cocci: simplify check for trivial format strings
  18. Merge branch 'nd/trace-index-ops'

    gitster committed Feb 15, 2018
    * nd/trace-index-ops:
      trace: measure where the time is spent in the index-heavy operations
  19. Merge branch 'cc/perf-aggregate'

    gitster committed Feb 15, 2018
    "make perf" enhancement.
    
    * cc/perf-aggregate:
      perf/aggregate: sort JSON fields in output
      perf/aggregate: add --reponame option
      perf/aggregate: add --subsection option
  20. Merge branch 'ab/wildmatch-tests'

    gitster committed Feb 15, 2018
    More tests for wildmatch functions.
    
    * ab/wildmatch-tests:
      wildmatch test: mark test as EXPENSIVE_ON_WINDOWS
      test-lib: add an EXPENSIVE_ON_WINDOWS prerequisite
      wildmatch test: create & test files on disk in addition to in-memory
      wildmatch test: perform all tests under all wildmatch() modes
      wildmatch test: use test_must_fail, not ! for test-wildmatch
      wildmatch test: remove dead fnmatch() test code
      wildmatch test: use a paranoia pattern from nul_match()
      wildmatch test: don't try to vertically align our output
      wildmatch test: use more standard shell style
      wildmatch test: indent with tabs, not spaces
  21. Merge branch 'po/object-id'

    gitster committed Feb 15, 2018
    Conversion from uchar[20] to struct object_id continues.
    
    * po/object-id:
      sha1_file: rename hash_sha1_file_literally
      sha1_file: convert write_loose_object to object_id
      sha1_file: convert force_object_loose to object_id
      sha1_file: convert write_sha1_file to object_id
      notes: convert write_notes_tree to object_id
      notes: convert combine_notes_* to object_id
      commit: convert commit_tree* to object_id
      match-trees: convert splice_tree to object_id
      cache: clear whole hash buffer with oidclr
      sha1_file: convert hash_sha1_file to object_id
      dir: convert struct sha1_stat to use object_id
      sha1_file: convert pretend_sha1_file to object_id
  22. Merge branch 'sb/pull-rebase-submodule'

    gitster committed Feb 15, 2018
    "git pull --rebase" did not pass verbosity setting down when
    recursing into a submodule.
    
    * sb/pull-rebase-submodule:
      builtin/pull: respect verbosity settings in submodules
  23. Merge branch 'kg/packed-ref-cache-fix'

    gitster committed Feb 15, 2018
    Avoid mmapping small files while using packed refs (especially ones
    with zero size, which would cause later munmap() to fail).
    
    * kg/packed-ref-cache-fix:
      packed_ref_cache: don't use mmap() for small files
      load_contents(): don't try to mmap an empty file
      packed_ref_iterator_begin(): make optimization more general
      find_reference_location(): make function safe for empty snapshots
      create_snapshot(): use `xmemdupz()` rather than a strbuf
      struct snapshot: store `start` rather than `header_len`
  24. Merge branch 'jt/fsck-code-cleanup'

    gitster committed Feb 15, 2018
    Plug recently introduced leaks in fsck.
    
    * jt/fsck-code-cleanup:
      fsck: fix leak when traversing trees
  25. Merge branch 'en/merge-recursive-fixes'

    gitster committed Feb 15, 2018
    * en/merge-recursive-fixes:
      merge-recursive: add explanation for src_entry and dst_entry
      merge-recursive: fix logic ordering issue
      Tighten and correct a few testcases for merging and cherry-picking
  26. Merge branch 'jc/worktree-add-short-help'

    gitster committed Feb 15, 2018
    Error message fix.
    
    * jc/worktree-add-short-help:
      worktree: say that "add" takes an arbitrary commit in short-help
  27. Merge branch 'ab/sha1dc-build'

    gitster committed Feb 15, 2018
    Push the submodule version of collision-detecting SHA-1 hash
    implementation a bit harder on builders.
    
    * ab/sha1dc-build:
      sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
      Makefile: under "make dist", include the sha1collisiondetection submodule
      Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto
Commits on Feb 14, 2018
  1. Second batch for 2.17

    gitster committed Feb 14, 2018
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 13, 2018
  1. Merge branch 'tz/doc-show-defaults-to-head'

    gitster committed Feb 13, 2018
    Doc update.
    
    * tz/doc-show-defaults-to-head:
      doc: mention 'git show' defaults to HEAD
  2. Merge branch 'ew/svn-branch-segfault-fix'

    gitster committed Feb 13, 2018
    Workaround for segfault with more recent versions of SVN.
    
    * ew/svn-branch-segfault-fix:
      git-svn: control destruction order to avoid segfault