Merge branch 'maint'

* maint:
GIT 1.5.6.4
builtin-rm: fix index lock file path
http-fetch: do not SEGV after fetching a bad pack idx file
rev-list: honor --quiet option
api-run-command.txt: typofix

diff --cc builtin-rev-list.c
Simple merge

diff --cc builtin-rm.c
Simple merge

diff --cc http-walker.c
Simple merge

diff --cc t/t3600-rm.sh
index 316775ecd96208c07f3211a24de2e5ec2ee409ab,7893d8c40ea510595b0483432e71a74b11b24598..79c06adf1f035cf727771974b2f9713da9d2fb8c
--- 1/t/t3600-rm.sh
--- 2/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@@ -214,7 -214,19 +214,19 @@@ test_expect_success 'Recursive with -r 
  '
  
  test_expect_success 'Remove nonexistent file returns nonzero exit status' '
 -      ! git rm nonexistent
 +      test_must_fail git rm nonexistent
  '
  
+ test_expect_success 'Call "rm" from outside the work tree' '
+       mkdir repo &&
+       cd repo &&
+       git init &&
+       echo something > somefile &&
+       git add somefile &&
+       git commit -m "add a file" &&
+       (cd .. &&
+        git --git-dir=repo/.git --work-tree=repo rm somefile) &&
+       test_must_fail git ls-files --error-unmatch somefile
+ '
+ 
  test_done