Junio C Hamano db689dd0f9 Merge branch 'master' into next ...

* master:
  Update draft release notes to 1.7.8
  Fix some "variable might be used uninitialized" warnings
  Makefile: fix permissions of mergetools/ checked out with permissive umask

Conflicts:
	refs.c

This also fixes an earlier mismerge where I still had sort_ref_array() at
the end of get_ref_dir() which defeats the whole purpose of one of the
topic branches. get_loose_refs() asks get_ref_dir() to recursively fill
the ref array and sorts the result only once.

2011-10-10 16:16:34 -07:00

72 KiB

Raw Blame History

View Raw