Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Aug 2010 02:58:40 +0000 (19:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Aug 2010 02:59:48 +0000 (19:59 -0700)
* 'jn/maint-setup-fix' (early part):
Revert "rehabilitate 'git index-pack' inside the object store"
setup: do not forget working dir from subdir of gitdir
t4111 (apply): refresh index before applying patches to it
setup: split off get_device_or_die helper
setup: split off a function to handle hitting ceiling in repo search
setup: split off code to handle stumbling upon a repository
setup: split off a function to checks working dir for .git file
setup: split off $GIT_DIR-set case from setup_git_directory_gently
tests: try git apply from subdir of toplevel
t1501 (rev-parse): clarify

1  2 
setup.c
diff --cc setup.c
Simple merge