delta/git.git, branch rs/ls-files-partial-optim

ls-files: move only kept cache entries in prune_cache()

2017-02-13T20:06:10+00:00

prune_cache() first identifies those entries at the start of the sorted
array that can be discarded.  Then it moves the rest of the entries up.
Last it identifies the unwanted trailing entries among the moved ones
and cuts them off.

Change the order: Identify both start *and* end of the range to keep
first and then move only those entries to the top.  The resulting code
is slightly shorter and a bit more efficient.

Signed-off-by: Rene Scharfe 
Reviewed-by: Brandon Williams 
Signed-off-by: Junio C Hamano

ls-files: pass prefix length explicitly to prune_cache()

2017-02-13T20:06:08+00:00

The function prune_cache() relies on the fact that it is only called on
max_prefix and sneakily uses the matching global variable max_prefix_len
directly.  Tighten its interface by passing both the string and its
length as parameters.  While at it move the NULL check into the function
to collect all cache-pruning related logic in one place.

Signed-off-by: Rene Scharfe 
Reviewed-by: Brandon Williams 
Signed-off-by: Junio C Hamano

Git 2.11.1

2017-02-02T21:21:27+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ws/request-pull-code-cleanup' into maint

2017-02-02T21:20:30+00:00

Code clean-up.

* ws/request-pull-code-cleanup:
  request-pull: drop old USAGE stuff

Merge branch 'jk/execv-dashed-external' into maint

2017-02-02T21:20:29+00:00

Typing ^C to pager, which usually does not kill it, killed Git and
took the pager down as a collateral damage in certain process-tree
structure.  This has been fixed.

* jk/execv-dashed-external:
  execv_dashed_external: wait for child on signal death
  execv_dashed_external: stop exiting with negative code
  execv_dashed_external: use child_process struct

Ready for 2.11.1

2017-01-31T21:34:48+00:00

Signed-off-by: Junio C Hamano

Merge branch 'sb/in-core-index-doc' into maint

2017-01-31T21:32:11+00:00

Documentation and in-code comments updates.

* sb/in-core-index-doc:
  documentation: retire unfinished documentation
  cache.h: document add_[file_]to_index
  cache.h: document remove_index_entry_at
  cache.h: document index_name_pos

Merge branch 'js/mingw-isatty' into maint

2017-01-31T21:32:11+00:00

An update to a topic that is already in 'master'.

* js/mingw-isatty:
  mingw: follow-up to "replace isatty() hack"

Merge branch 'jk/coding-guidelines-update' into maint

2017-01-31T21:32:11+00:00

Developer doc update.

* jk/coding-guidelines-update:
  CodingGuidelines: clarify multi-line brace style

Merge branch 'js/exec-path-coverity-workaround' into maint

2017-01-31T21:32:10+00:00

Code cleanup.

* js/exec-path-coverity-workaround:
  git_exec_path: do not return the result of getenv()
  git_exec_path: avoid Coverity warning about unfree()d result