diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-29 20:16:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-29 20:16:34 -0800 |
| commit | 799fdb4ed0f9443122fdb85f6f73c58cb1de12ec (patch) | |
| tree | 451006d4be4d718d3cd33f0f947ebeea295b3481 /t | |
| parent | c985ddf318a8c41c6e1abc8bebd058b31c7413c1 (diff) | |
| parent | e97ca7f41f2b9bbdfc93d103c3f64337bb6dcc20 (diff) | |
| download | git-799fdb4ed0f9443122fdb85f6f73c58cb1de12ec.tar.gz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
commit: --cleanup is a message option
t7102: make the test fail if one of its check fails
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 e637c7d4db..5f3916bf4f 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 ' |