• Jeff King's avatar
    t5537: re-drop http tests · d7172825
    Jeff King authored
    These were originally removed by 0232852b (t5537: move
    http tests out to t5539, 2014-02-13). However, they were
    accidentally re-added in 1ddb4d7e (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
         0232852b 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: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
t5537-fetch-shallow.sh 3.61 KB