| commit | f5a8ad4c5a2c89555b728ccbaad04bf416cc4274 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Nov 2016 21:56:30 +0000 (11 13:56 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Nov 2016 21:56:30 +0000 (11 13:56 -0800) | ||
| tree | 3f38bde5dd0bf9e612131ad94440e10a41cb97d5 | treesnapshot (tar.gz zip) |
| parent | 0538b84027a8aba7e8b805e3ec8fceb3990023e5 | commitdiff |
| parent | fdf4f6c79b4260e98729ebeb208036765595e9ac | commitdiff |
Merge branch 'as/merge-attr-sleep'
Fix for a racy false-positive test failure.
* as/merge-attr-sleep:
t6026: clarify the point of "kill $(cat sleep.pid)"
t6026: ensure that long-running script really is
Revert "t6026-merge-attr: don't fail if sleep exits early"
Revert "t6026-merge-attr: ensure that the merge driver was called"
t6026-merge-attr: ensure that the merge driver was called
t6026-merge-attr: don't fail if sleep exits early
Fix for a racy false-positive test failure.
* as/merge-attr-sleep:
t6026: clarify the point of "kill $(cat sleep.pid)"
t6026: ensure that long-running script really is
Revert "t6026-merge-attr: don't fail if sleep exits early"
Revert "t6026-merge-attr: ensure that the merge driver was called"
t6026-merge-attr: ensure that the merge driver was called
t6026-merge-attr: don't fail if sleep exits early