diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-02 12:02:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-02 12:02:16 -0700 |
| commit | 9d52f15af7de943779cf6302cef4f1a88ce447be (patch) | |
| tree | 53c0f1a56674b66491cd0e6942fca82b5a1968e9 /t/test-lib.sh | |
| parent | builtin/push.c: remove useless temporary variable (diff) | |
| parent | Merge branch 'ab/tap' into maint (diff) | |
| download | tgif-9d52f15af7de943779cf6302cef4f1a88ce447be.tar.xz | |
Merge branch 'maint'
* maint:
test-lib: Remove 3 year old no-op --no-python option
test-lib: Ignore --quiet under a TAP harness
Documentation/rev-parse: quoting is required with --parseopt
Documentation: reporting bugs
Fix git rebase --continue to work with touched files
Document ls-files -t as semi-obsolete.
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index e5523dd690..e8f21d577c 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -127,14 +127,13 @@ do -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) verbose=t; shift ;; -q|--q|--qu|--qui|--quie|--quiet) - quiet=t; shift ;; + # Ignore --quiet under a TAP::Harness. Saying how many tests + # passed without the ok/not ok details is always an error. + test -z "$HARNESS_ACTIVE" && quiet=t; shift ;; --with-dashes) with_dashes=t; shift ;; --no-color) color=; shift ;; - --no-python) - # noop now... - shift ;; --va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind) valgrind=t; verbose=t; shift ;; --tee) |