On Sun, Oct 3, 2010 at 19:59, Elijah Newren <newren@xxxxxxxxx> wrote:
> From: Ãvar ArnfjÃrà Bjarmason <avarab@xxxxxxxxx>
>
> Change test_expect_code to be a normal test command instead of a
> top-level command.
> [...]
> Signed-off-by: Ãvar ArnfjÃrà Bjarmason <avarab@xxxxxxxxx>
> Acked-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
> ---
> Ât/README Â Â Â Â Â Â Â Â| Â 16 +++++++------
> Ât/t0000-basic.sh    Â|  55 ++++++++++++++++++++++++++++++++++++++--------
> Ât/t1504-ceiling-dirs.sh | Â Â5 ++-
> Ât/t6020-merge-df.sh   |  Â4 ++-
> Ât/test-lib.sh      |  40 ++++++++++++++++++---------------
> Â5 files changed, 82 insertions(+), 38 deletions(-)
This doc change looks. Here's the diff against my patch for reference:
diff --git a/t/README b/t/README
index c216e8c..ee4c0cf 100644
--- a/t/README
+++ b/t/README
@@ -475,10 +475,10 @@ library for your script to use.
'Perl API' \
"$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl
- - test_expect_code <exit-code> <git-command>
+ - test_expect_code <exit-code> <command>
- Run a git command and ensure that it exits with the given exit
- code. For example:
+ Run a command and ensure that it exits with the given exit code.
+ For example:
test_expect_success 'Merge with d/f conflicts' '
test_expect_code 1 git merge "merge msg" B master
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html