summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorTechlive Zheng <techlivezheng@gmail.com>2015-11-13 02:32:33 (GMT)
committerJeff King <peff@peff.net>2015-11-13 05:02:56 (GMT)
commit4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6 (patch)
tree87ee90beae8f2f3a721e3e28d0dae6069155941f /contrib/subtree
parentc9924996c95cfcc7633448e7ee8b88f440ccbd2b (diff)
downloadgit-4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6.zip
git-4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6.tar.gz
git-4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6.tar.bz2
contrib/subtree: Add merge tests
Add some tests for various merge operations. Test combinations of merge with --message, --prefix and --squash. Signed-off-by: Techlive Zheng <techlivezheng@gmail.com> Signed-off-by: David A. Greene <greened@obbligato.org> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'contrib/subtree')
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh13
1 files changed, 12 insertions, 1 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 1fa5991..7d59a1a 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -210,11 +210,22 @@ test_expect_success 'check if --message for merge works with squash too' '
test_expect_success 'merge new subproj history into subdir' '
git subtree merge --prefix="sub dir" FETCH_HEAD &&
- git branch pre-split &&
check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline" &&
undo
'
+test_expect_success 'merge new subproj history into subdir/ with --prefix and --message' '
+ git subtree merge --prefix="sub dir" --message="Merged changes from subproject" FETCH_HEAD &&
+ check_equal "$(last_commit_message)" "Merged changes from subproject" &&
+ undo
+'
+
+test_expect_success 'merge new subproj history into subdir/ with --squash and --prefix and --message' '
+ git subtree merge --prefix="sub dir" --message="Merged changes from subproject using squash" --squash FETCH_HEAD &&
+ check_equal "$(last_commit_message)" "Merged changes from subproject using squash" &&
+ undo
+'
+
test_expect_success 'split requires option --prefix' '
echo "You must provide the --prefix option." > expected &&
test_must_fail git subtree split > actual 2>&1 &&