Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (111 commits)
  Prepare for 1.7.7.1
  grep: fix the error message that mentions --exclude
  send-email: Fix %config_path_settings handling
  t1304: fall back to $USER if $LOGNAME is not defined
  Update draft release notes to 1.7.8
  Update draft release notes to 1.7.8
  t5403: convert leading spaces to tabs
  Update draft release notes to 1.7.8
  refs.c: free duplicate entries in the ref array instead of leaking them
  refs.c: abort ref search if ref array is empty
  refs.c: ensure struct whose member may be passed to realloc is initialized
  Fix some "variable might be used uninitialized" warnings
  Makefile: fix permissions of mergetools/ checked out with permissive umask
  merge-one-file: fix "expr: non-numeric argument"
  ident: do not retrieve default ident when unnecessary
  add_ref(): verify that the refname is formatted correctly
  resolve_ref(): expand documentation
  resolve_ref(): also treat a too-long SHA1 as invalid
  resolve_ref(): emit warnings for improperly-formatted references
  resolve_ref(): verify that the input refname has the right format
  ...