Merge branch 'master' into jc/cache-tree
authorJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 01:32:45 +0000 (18:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 01:32:45 +0000 (18:32 -0700)
commite7afa1115beb071512ac2b8d6b7487eadbfccc74
treee1473acf5c9da91c36ab64d8c941fe7bd632090e
parentb8ed7f0f40743dae6111c8950ba55051933298ca
parent9af0b8dbe2fb252262412a11254e2bcc6ffb87bb
Merge branch 'master' into jc/cache-tree

* master:
  t0000-basic: more commit-tree tests.
  commit-tree.c: check_valid() microoptimization.
  Fix filename verification when in a subdirectory
  rebase: typofix.
  socksetup: don't return on set_reuse_addr() error
cache.h