undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib/subtree: Add test for missing subtree

Browse Source 
Test that a merge from a non-existant subtree fails.

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:31 -06:00 committed by Jeff King
parent b0638aa2f8
commit a686701184
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/subtree/t/t7900-subtree.sh
View File

@ -123,6 +123,10 @@ test_expect_success 'no pull from non-existant subtree' '
test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" sub1 test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" sub1
' '
test_expect_success 'no merge from non-existent subtree' '
test_must_fail git subtree merge --prefix="sub dir" FETCH_HEAD
'
test_expect_success 'check if --message works for add' ' test_expect_success 'check if --message works for add' '
git subtree add --prefix="sub dir" --message="Added subproject" sub1 && git subtree add --prefix="sub dir" --message="Added subproject" sub1 &&
check_equal ''"$(last_commit_message)"'' "Added subproject" && check_equal ''"$(last_commit_message)"'' "Added subproject" &&