]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ph/transport-with-gitfile'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
* ph/transport-with-gitfile:
  Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile
  Add test showing git-fetch groks gitfiles
  Teach transport about the gitfile mechanism
  Learn to handle gitfiles in enter_repo
  enter_repo: do not modify input

1  2 
cache.h
daemon.c
transport.c

diff --cc cache.h
Simple merge
diff --cc daemon.c
Simple merge
diff --cc transport.c
Simple merge