From: Jeff King <peff@peff.net>
Date: Tue, 1 Dec 2015 23:54:31 +0000 (-0500)
Subject: Merge branch 'dg/subtree-test-cleanup'
X-Git-Tag: v2.7.0-rc0~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30fe9b2f9aece7f8f24bc069b9d7470b8291535e;p=git

Merge branch 'dg/subtree-test-cleanup'

Test cleanups for the subtree project.

* dg/subtree-test-cleanup:
  contrib/subtree: Handle '--prefix' argument with a slash appended
  contrib/subtree: Make each test self-contained
  contrib/subtree: Add split tests
  contrib/subtree: Add merge tests
  contrib/subtree: Add tests for subtree add
  contrib/subtree: Add test for missing subtree
  contrib/subtree: Clean and refactor test code
---

30fe9b2f9aece7f8f24bc069b9d7470b8291535e