Merge branch 'maint-1.6.4' into maint-1.6.5
commita07b10c8f930e88386d3b7424f25190af554275e
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Jul 2010 04:51:58 +0000 (25 21:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Jul 2010 04:51:58 +0000 (25 21:51 -0700)
treecbacdd069189db730084b08cc05c8a041ce64934
parent8024d5961bf885245d8febcb189a8c71bb46b29f
parent1b0b962d771fb734cbf273f216b487bb58dec7b9
Merge branch 'maint-1.6.4' into maint-1.6.5

* maint-1.6.4:
  Check size of path buffer before writing into it
  rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
setup.c