From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Jul 2010 18:29:30 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5f7baac1e34440d3805ef488c97af748f3c20640;p=git.git

Merge branch 'maint'

* maint:
  t/README: clarify test_must_fail description
  Check size of path buffer before writing into it

Conflicts:
	t/README
---

5f7baac1e34440d3805ef488c97af748f3c20640
diff --cc t/README
index b906ceb47,fecb76e59..a59014243
--- a/t/README
+++ b/t/README
@@@ -451,35 -278,11 +451,37 @@@ library for your script to use
   - test_must_fail <git-command>
  
     Run a git command and ensure it fails in a controlled way.  Use
-    this instead of "! <git-command>" to fail when git commands
-    segfault.
+    this instead of "! <git-command>".  When git-command dies due to a
+    segfault, test_must_fail diagnoses it as an error; "! <git-command>"
+    treats it as just another expected failure, which would let such a
+    bug go unnoticed.
  
 + - test_might_fail <git-command>
 +
 +   Similar to test_must_fail, but tolerate success, too.  Use this
 +   instead of "<git-command> || :" to catch failures due to segv.
 +
 + - test_cmp <expected> <actual>
 +
 +   Check whether the content of the <actual> file matches the
 +   <expected> file.  This behaves like "cmp" but produces more
 +   helpful output when the test is run with "-v" option.
 +
 + - test_when_finished <script>
 +
 +   Prepend <script> to a list of commands to run to clean up
 +   at the end of the current test.  If some clean-up command
 +   fails, the test will not pass.
 +
 +   Example:
 +
 +	test_expect_success 'branch pointing to non-commit' '
 +		git rev-parse HEAD^{tree} >.git/refs/heads/invalid &&
 +		test_when_finished "git update-ref -d refs/heads/invalid" &&
 +		...
 +	'
 +
 +
  Tips for Writing Tests
  ----------------------