From: Techlive Zheng <techlivezh...@gmail.com>
Test that a merge from a non-existant subtree fails.
Signed-off-by: Techlive Zheng <techlivezh...@gmail.com>
Signed-off-by: David A. Greene <gree...@obbligato.org>
---
contrib/subtree/t/t7900-subtree.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/contrib/subtree/t/t7900-subtree.sh
b/contrib/subtree/t/t7900-subtree.sh
index f9dda3d..4471786 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -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" &&
--
2.6.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
