Code

Merge branch 'jm/maint-misc-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 May 2011 07:09:41 +0000 (00:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 May 2011 07:09:41 +0000 (00:09 -0700)
commit5b42477b59886a85d4b49a60313f9b9d4a0d576f
tree55e42d432085f0afec9a5bc9f4251adcf1dcbfa5
parenta059240f06967f485e0a094e220bae73a746ed24
parentb1905aeac5aded421cd90f8d264e27bb39672b36
Merge branch 'jm/maint-misc-fix' into maint

* jm/maint-misc-fix:
  read_gitfile_gently: use ssize_t to hold read result
  remove tests of always-false condition
  rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
fsck.c
rerere.c
setup.c
transport.c