Merge branch 'handle-osx-wc-whitespace' into pu

* branch handle-osx-wc-whitespace:
  t1000: use test_line_count where appropriate
  t/setup.sh: import test_line_count from git.git

Fix tests that rely on "wc -l" just printing a line count.
Merge branch 'bashcomplete-prefix' into pu

* branch bashcomplete-prefix:
  WIP

Improve bash completion when a prefix is being applied to refs.
Merge branch 'check-git-version' into pu

* branch check-git-version:
  Check that git-stripspace supports "--comment-lines"

Avoid displaying a cryptic error message when the installed Git
version is too old and so does not support the --comment-lines option
to git-stripspace.

This may be better implemented as a sanity check in the makefile.