From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2009 04:46:55 +0000 (-0700)
Subject: Merge branch 'pb/maint-1.6.2-userdiff-fix'
X-Git-Tag: v1.6.4-rc0~50
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b58f6b50c1032a8ac56ab09e99500d43da3919d1;p=git.git

Merge branch 'pb/maint-1.6.2-userdiff-fix'

* pb/maint-1.6.2-userdiff-fix:
  upload-archive: fix infinite loop on Cygwin
  avoid exponential regex match for java and objc function names
---

b58f6b50c1032a8ac56ab09e99500d43da3919d1