diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-29 16:41:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 16:41:55 -0700 |
| commit | f5cfd52f7b85d693b3782297819981a502a0135b (patch) | |
| tree | 18ee132a84ab97f275a35b595b6a713611861f6f | |
| parent | Git 1.7.6 (diff) | |
| parent | test: skip clean-up when running under --immediate mode (diff) | |
| download | tgif-f5cfd52f7b85d693b3782297819981a502a0135b.tar.xz | |
Merge branch 'maint-1.7.5' into maint
* maint-1.7.5:
test: skip clean-up when running under --immediate mode
"branch -d" can remove more than one branches
| -rw-r--r-- | builtin/branch.c | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index d6ab93bfbb..3142daa57a 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -19,7 +19,7 @@ static const char * const builtin_branch_usage[] = { "git branch [options] [-r | -a] [--merged | --no-merged]", "git branch [options] [-l] [-f] <branchname> [<start-point>]", - "git branch [options] [-r] (-d | -D) <branchname>", + "git branch [options] [-r] (-d | -D) <branchname>...", "git branch [options] (-m | -M) [<oldbranch>] <newbranch>", NULL }; diff --git a/t/test-lib.sh b/t/test-lib.sh index 8c57a00595..df25f17929 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -446,9 +446,14 @@ test_debug () { test_run_ () { test_cleanup=: + expecting_failure=$2 eval >&3 2>&4 "$1" eval_ret=$? - eval >&3 2>&4 "$test_cleanup" + + if test -z "$immediate" || test $eval_ret = 0 || test -n "$expecting_failure" + then + eval >&3 2>&4 "$test_cleanup" + fi if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"; then echo "" fi @@ -497,7 +502,7 @@ test_expect_failure () { if ! test_skip "$@" then say >&3 "checking known breakage: $2" - test_run_ "$2" + test_run_ "$2" expecting_failure if [ "$?" = 0 -a "$eval_ret" = 0 ] then test_known_broken_ok_ "$1" @@ -774,6 +779,9 @@ test_cmp() { # # except that the greeting and config --unset must both succeed for # the test to pass. +# +# Note that under --immediate mode, no clean-up is done to help diagnose +# what went wrong. test_when_finished () { test_cleanup="{ $* |