mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
contrib/subtree: Add test for missing subtree
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:
parent
b0638aa2f8
commit
a686701184
|
@ -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_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' '
|
||||
git subtree add --prefix="sub dir" --message="Added subproject" sub1 &&
|
||||
check_equal ''"$(last_commit_message)"'' "Added subproject" &&
|
||||
|
|
Loading…
Reference in a new issue