Permalink
Commits on Aug 30, 2016
  1. Merge branch 'ukk/zdiff3' into HEAD

    * ukk/zdiff3:
      xdiff: implement a zealous diff3
    committed Aug 30, 2016
  2. Merge branch 'jk/xdl-siphash' into HEAD

    * jk/xdl-siphash:
      xdl: use siphash
      add siphash.h
    committed Aug 30, 2016
  3. Merge branch 'jk/xdiff-hardening' into HEAD

    * jk/xdiff-hardening:
      xdiff: convert size variables to size_t
      xdiff: use st_* helper functions for allocations
    committed Aug 30, 2016
  4. Merge branch 'jk/valgrind-fixups' into HEAD

    * jk/valgrind-fixups:
      transport-helper: initialize debug flag before starting threads
    committed Aug 30, 2016
  5. Merge branch 'jk/update-ref-rename' into HEAD

    * jk/update-ref-rename:
      teach update-ref a "--rename" option
    committed Aug 30, 2016
  6. Merge branch 'jk/tree-corruption' into HEAD

    * jk/tree-corruption:
      tree-walk: be more specific about corrupt tree errors
    committed Aug 30, 2016
  7. Merge branch 'jk/trace-stdin' into HEAD

    * jk/trace-stdin:
      run-command: terrible hack for loading config
      run-command config experiment
      trace: add GIT_TRACE_STDIN
      trace: add pid to each output line
      trace: implement %p placeholder for filenames
    committed Aug 30, 2016
  8. Merge branch 'jk/test-signals' into HEAD

    * jk/test-signals:
      tests: factor portable signal check out of t0005
    committed Aug 30, 2016
  9. Merge branch 'jk/test-results-no-pid' into HEAD

    * jk/test-results-no-pid:
      test-lib: drop PID from test-results/*.count
    committed Aug 30, 2016
  10. Merge branch 'jk/symbolic-ref-no-symlinks' into HEAD

    * jk/symbolic-ref-no-symlinks:
      create_symref: drop support for writing symbolic links
      create_symref: deprecate support for writing symbolic links
    committed Aug 30, 2016
  11. Merge branch 'jk/shortlog-ident' into HEAD

    * jk/shortlog-ident:
      shortlog: match commit trailers with --ident
      trailer: add interface for parsing commit trailers
      trailer: factor out config reading
      shortlog: allow grouping by committer ident
      shortlog: change "author" variables to "ident"
    committed Aug 30, 2016
  12. Merge branch 'jk/repack-alternates' into HEAD

    * jk/repack-alternates:
      repack: warn when "-l" is not used with alternates
    committed Aug 30, 2016
  13. Merge branch 'jk/rename-progress' into HEAD

    * jk/rename-progress:
      diff: turn on rename detection progress reporting
      show: turn on rename detection progress reporting
      progress: use pager's original_stderr if available
      pager: save the original stderr when redirecting to pager
    committed Aug 30, 2016
  14. Merge branch 'jk/rebase-no-ident' into HEAD

    * jk/rebase-no-ident:
      rebase-interactive: drop early check for valid ident
    committed Aug 30, 2016
  15. Merge branch 'jk/pager-subcommand' into HEAD

    * jk/pager-subcommand:
      show git tag output in pager
    committed Aug 30, 2016
  16. Merge branch 'jk/pager-in-use-careful' into HEAD

    * jk/pager-in-use-careful:
      pager_in_use: make sure output is still going to pager
      pager_in_use: use git_env_bool
    committed Aug 30, 2016
  17. Merge branch 'jk/pager' into HEAD

    * jk/pager:
      support pager.* for aliases
    committed Aug 30, 2016
  18. Merge branch 'jk/less-aggressive-depth' into HEAD

    * jk/less-aggressive-depth:
      gc: default aggressive depth to 50
    committed Aug 30, 2016
  19. Merge branch 'jk/ignore-have' into HEAD

    * jk/ignore-have:
      receive-pack: respect receive.advertiseAlternates config
    committed Aug 30, 2016
  20. Merge branch 'jk/ident' into HEAD

    * jk/ident:
      commit: give a hint when a commit message has been abandoned
    committed Aug 30, 2016
  21. Merge branch 'jk/helper-errors' into HEAD

    * jk/helper-errors:
      print an error when remote helpers die during capabilities
    committed Aug 30, 2016
  22. Merge branch 'jk/filter-branch-example' into HEAD

    * jk/filter-branch-example:
      docs/filter-branch: clean up newsubdir example
      update-index: add --clear option
    committed Aug 30, 2016
  23. Merge branch 'jk/faster-counting' into HEAD

    * jk/faster-counting:
      pack-objects: use mru list when iterating over packs
      pack-objects: break delta cycles before delta-search phase
      sha1_file: make packed_object_info public
      provide an initializer for "struct object_info"
    committed Aug 30, 2016
  24. Merge branch 'jk/export-symlink' into HEAD

    * jk/export-symlink:
      fix?
      t9350-fast-export: Add failing test for symlink-to-directory
    committed Aug 30, 2016
  25. Merge branch 'jk/embedded-bare-repo' into HEAD

    * jk/embedded-bare-repo:
      setup: don't choose tracked bare repos
    committed Aug 30, 2016
  26. Merge branch 'jk/dumpstat' into HEAD

    * jk/dumpstat:
      zeromq dumpstat implementation
      dumpstat-ify upload-pack
      dumpstat to fd
      dumpstat
    committed Aug 30, 2016
  27. Merge branch 'jk/diff-highlight-lcs' into HEAD

    * jk/diff-highlight-lcs:
      tweaking split pattern
      turn off highlighting when we cross a certain percentage of the hunk
      diff-highlight: use a real LCS diff
    committed Aug 30, 2016
  28. Merge branch 'jk/diff-attr-hook' into HEAD

    * jk/diff-attr-hook:
      diff: use diff-attr hook to determine attributes from content
    committed Aug 30, 2016
  29. Merge branch 'jk/delta-cache' into HEAD

    * jk/delta-cache:
      t/perf: add basic perf tests for delta base cache
      delta_base_cache: use hashmap.h
      delta_base_cache: drop special treatment of blobs
      delta_base_cache: use list.h for LRU
      release_delta_base_cache: reuse existing detach function
      clear_delta_base_cache_entry: use a more descriptive name
      cache_or_unpack_entry: drop keep_cache parameter
    committed Aug 30, 2016
  30. Merge branch 'jk/credential-interactive' into HEAD

    * jk/credential-interactive:
      wip
    committed Aug 30, 2016
  31. Merge branch 'jk/clang-format' into HEAD

    * jk/clang-format:
      hacky interactive clang format
      .clang-format: introduce the use of clang-format
    committed Aug 30, 2016
  32. Merge branch 'jk/child-cleanup' into HEAD

    * jk/child-cleanup:
      send-pack: kill pack-objects helper on signal or exit
    committed Aug 30, 2016
  33. Merge branch 'jk/checkout-reflog-name' into HEAD

    * jk/checkout-reflog-name:
      checkout: pass resolved default HEAD to create_branch
      create_branch: drop unused "head" parameter
    committed Aug 30, 2016
  34. Merge branch 'jk/check-alternate-connectedness' into HEAD

    * jk/check-alternate-connectedness:
      check_everything_connected: assume alternate ref tips are valid
    committed Aug 30, 2016
  35. Merge branch 'jk/blame-tree' into HEAD

    * jk/blame-tree:
      add blame-tree command
      combine-diff: zero memory used for callback filepairs
      teach tree-diff a max-depth parameter
      within_depth: fix return for empty path
    committed Aug 30, 2016