Merge branch 'master' into next
commit495eb646dfa21a497a01dcbdcb6535bc52e20a3e
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 01:20:17 +0000 (21 17:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 01:20:17 +0000 (21 17:20 -0800)
tree79c4c1238e2fc6c9e00f55baa01828236a6da4c8
parenta71843abac0d3679ef8ee8e818795c39d1910e44
parenta66cee2edeb503cb7a589ff9d9efa75dc8f0fedc
Merge branch 'master' into next

* master:
  t/t7500-commit.sh: use test_cmp instead of test
  t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate
  gitweb/gitweb.perl: don't call S_ISREG() with undef
  gitweb/gitweb.perl: remove use of qw(...) as parentheses