diff options
| author |  Jeff King <peff@peff.net> | 2014-05-29 21:34:19 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-05-30 09:46:19 -0700 |
| commit | d7172825321369cb951dd7bbfc0c12dc4ecbe518 (patch) | |
| tree | 6b62e05ebe9a9c657c3c28afc7b180d3c45c107b /t/t9601/cvsroot/.gitattributes | |
| parent | Git 2.0 (diff) | |
| download | tgif-d7172825321369cb951dd7bbfc0c12dc4ecbe518.tar.xz | |
t5537: re-drop http tests
These were originally removed by 0232852 (t5537: move
http tests out to t5539, 2014-02-13). However, they were
accidentally re-added in 1ddb4d7 (Merge branch
'nd/upload-pack-shallow', 2014-03-21).
This looks like an error in manual conflict resolution.
Here's what happened:
1. v1.9.0 shipped with the http tests in t5537.
2. We realized that this caused problems, and built
0232852 on top to move the tests to their own file.
This fix made it into v1.9.1.
3. We later had another fix in nd/upload-pack-shallow that
also touched t5537. It was built directly on v1.9.0.
When we merged nd/upload-pack-shallow to master, we got a
conflict; it was built on a version with the http tests, but
we had since removed them. The correct resolution was to
drop the http tests and keep the new ones, but instead we
kept everything.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9601/cvsroot/.gitattributes')
0 files changed, 0 insertions, 0 deletions