Merge branch 'fix'

* fix:
commit-tree.c: check_valid() microoptimization.
Fix filename verification when in a subdirectory
rebase: typofix.
socksetup: don't return on set_reuse_addr() error

diff --cc commit-tree.c
Simple merge

diff --cc revision.c
Simple merge