From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 19 Jul 2008 18:28:06 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc0~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=679639904da05f7d84e9215960e76dd0f3353328;p=git.git

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
---

679639904da05f7d84e9215960e76dd0f3353328
diff --cc t/t3600-rm.sh
index 316775ecd,7893d8c40..79c06adf1
--- a/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