diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-25 02:51:49 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-25 02:51:49 +0300 |
| commit | b3ff808b714fd8fc5e4d2770720398e5dc7d27f9 (patch) | |
| tree | 3db88ef171d6fcae53d0edf714fb280134be3baf /t/annotate-tests.sh | |
| parent | c6caede7fd6bc428b4d2e53f6bb5c1e1a9bcb24c (diff) | |
| parent | 33fc521193746a0961c270997dbb881b520ad793 (diff) | |
Merge branch 'en/and-cascade-tests'
* en/and-cascade-tests: (25 commits)
t4124 (apply --whitespace): use test_might_fail
t3404: do not use 'describe' to implement test_cmp_rev
t3404 (rebase -i): introduce helper to check position of HEAD
t3404 (rebase -i): move comment to description
t3404 (rebase -i): unroll test_commit loops
t3301 (notes): use test_expect_code for clarity
t1400 (update-ref): use test_must_fail
t1502 (rev-parse --parseopt): test exit code from "-h"
t6022 (renaming merge): chain test commands with &&
test-lib: introduce test_line_count to measure files
tests: add missing &&, batch 2
tests: add missing &&
Introduce sane_unset and use it to ensure proper && chaining
t7800 (difftool): add missing &&
t7601 (merge-pull-config): add missing &&
t7001 (mv): add missing &&
t6016 (rev-list-graph-simplify-history): add missing &&
t5602 (clone-remote-exec): add missing &&
t4026 (color): remove unneeded and unchained command
t4019 (diff-wserror): add lots of missing &&
...
Conflicts:
t/t7006-pager.sh
Diffstat (limited to 't/annotate-tests.sh')
| -rw-r--r-- | t/annotate-tests.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 141b60cdcb..212bd605b5 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -38,7 +38,7 @@ test_expect_success \ 'prepare reference tree' \ 'echo "1A quick brown fox jumps over the" >file && echo "lazy dog" >>file && - git add file + git add file && GIT_AUTHOR_NAME="A" git commit -a -m "Initial."' test_expect_success \ |