development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

contrib/subtree: Add tests for subtree add

Browse source 
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>
This commit is contained in:
Techlive Zheng 2015-11-12 20:32:32 -06:00 committed by Jeff King
parent a686701184
commit c9924996c9
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
contrib/subtree/t/t7900-subtree.sh
View file

@ -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)"'''"'"'"