diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-30 01:25:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-30 01:25:21 -0800 |
| commit | 9e7ad090fad725e5f1862f64b07dc15d54bdc5b9 (patch) | |
| tree | 68eac0341c001ba82d4a309e0c80b166e0007142 /t | |
| parent | c2ff10c98e22ae64d553273e6d67bb123a1c916f (diff) | |
| parent | b0b3a241e2ca1ba5b928a128b6dcafb990df6e75 (diff) | |
| download | git-9e7ad090fad725e5f1862f64b07dc15d54bdc5b9.tar.gz git-9e7ad090fad725e5f1862f64b07dc15d54bdc5b9.tar.xz | |
Merge branch 'maint'
* maint:
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails
Documentation: always respect core.worktree if set
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7102-reset.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index e85ff02c3..b8cf2603a 100755 --- a/t/t7102-reset.sh +++ b/t/t7102-reset.sh @@ -139,19 +139,19 @@ test_expect_success \ test_expect_success \ 'resetting to HEAD with no changes should succeed and do nothing' ' git reset --hard && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && git reset --hard HEAD && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && git reset --soft && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && git reset --soft HEAD && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && git reset --mixed && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && git reset --mixed HEAD && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && git reset && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && git reset HEAD && check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc ' |