summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorTechlive Zheng <techlivezheng@gmail.com>2015-11-13 02:32:32 (GMT)
committerJeff King <peff@peff.net>2015-11-13 05:02:56 (GMT)
commitc9924996c95cfcc7633448e7ee8b88f440ccbd2b (patch)
treeee189bca9d823ef4f618b29c155f4cd110e3bbfc /contrib/subtree
parenta686701184bc9e3d54b2870455f3ff276360299e (diff)
downloadgit-c9924996c95cfcc7633448e7ee8b88f440ccbd2b.zip
git-c9924996c95cfcc7633448e7ee8b88f440ccbd2b.tar.gz
git-c9924996c95cfcc7633448e7ee8b88f440ccbd2b.tar.bz2
contrib/subtree: Add tests for subtree add
Add some tests to check various options to subtree add. These test various combinations of --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.sh19
1 files changed, 19 insertions, 0 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 4471786..1fa5991 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -127,12 +127,24 @@ test_expect_success 'no merge from non-existent subtree' '
test_must_fail git subtree merge --prefix="sub dir" FETCH_HEAD
'
+test_expect_success 'add subproj as subtree into sub dir/ with --prefix' '
+ git subtree add --prefix="sub dir" sub1 &&
+ check_equal "$(last_commit_message)" "Add '\''sub dir/'\'' from commit '\''$(git rev-parse sub1)'\''" &&
+ undo
+'
+
test_expect_success 'check if --message works for add' '
git subtree add --prefix="sub dir" --message="Added subproject" sub1 &&
check_equal ''"$(last_commit_message)"'' "Added subproject" &&
undo
'
+test_expect_success 'add subproj as subtree into sub dir/ with --prefix and --message' '
+ git subtree add --prefix="sub dir" --message="Added subproject" sub1 &&
+ check_equal "$(last_commit_message)" "Added subproject" &&
+ undo
+'
+
test_expect_success 'check if --message works as -m and --prefix as -P' '
git subtree add -P "sub dir" -m "Added subproject using git subtree" sub1 &&
check_equal ''"$(last_commit_message)"'' "Added subproject using git subtree" &&
@@ -145,6 +157,13 @@ test_expect_success 'check if --message works with squash too' '
undo
'
+test_expect_success 'add subproj as subtree into sub dir/ with --squash and --prefix and --message' '
+ git subtree add --prefix="sub dir" --message="Added subproject with squash" --squash sub1 &&
+ check_equal "$(last_commit_message)" "Added subproject with squash" &&
+ undo
+'
+
+# Maybe delete
test_expect_success 'add subproj to mainline' '
git subtree add --prefix="sub dir"/ FETCH_HEAD &&
check_equal ''"$(last_commit_message)"'' "Add '"'sub dir/'"' from commit '"'"'''"$(git rev-parse sub1)"'''"'"'"