summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTechlive Zheng <techlivezheng@gmail.com>2015-11-13 02:32:34 (GMT)
committerJeff King <peff@peff.net>2015-11-13 05:02:56 (GMT)
commit4fe2e33cc961328ea24e821692abc305d28e8ddb (patch)
tree00d5d433b7fcf1887aa8406fc3301c467b9c0318
parent4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6 (diff)
downloadgit-4fe2e33cc961328ea24e821692abc305d28e8ddb.zip
git-4fe2e33cc961328ea24e821692abc305d28e8ddb.tar.gz
git-4fe2e33cc961328ea24e821692abc305d28e8ddb.tar.bz2
contrib/subtree: Add split tests
Add tests to check various options to split. Check combinations of --prefix, --message, --annotate, --branch and --rejoin. 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>
-rwxr-xr-xcontrib/subtree/t/t7900-subtree.sh17
1 files changed, 15 insertions, 2 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 7d59a1a..6250194 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -250,7 +250,6 @@ test_expect_success 'split requires path given by option --prefix must exist' '
test_expect_success 'check if --message works for split+rejoin' '
spl1=''"$(git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
- git branch spl1 "$spl1" &&
check_equal ''"$(last_commit_message)"'' "Split & rejoin" &&
undo
'
@@ -282,7 +281,21 @@ test_expect_success 'check split with --branch for an incompatible branch' '
test_must_fail git subtree split --prefix "sub dir" --onto FETCH_HEAD --branch subdir
'
-test_expect_success 'check split+rejoin' '
+test_expect_success 'split sub dir/ with --rejoin' '
+ spl1=$(git subtree split --prefix="sub dir" --annotate="*") &&
+ git branch spl1 "$spl1" &&
+ git subtree split --prefix="sub dir" --annotate="*" --rejoin &&
+ check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$spl1'\''" &&
+ undo
+'
+
+test_expect_success 'split sub dir/ with --rejoin and --message' '
+ git subtree split --prefix="sub dir" --message="Split & rejoin" --annotate="*" --rejoin &&
+ check_equal "$(last_commit_message)" "Split & rejoin" &&
+ undo
+'
+
+test_expect_success 'check split+rejoin+onto' '
spl1=''"$(git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
undo &&
git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --rejoin &&