contrib/subtree: Add merge tests
Add some tests for various merge operations. Test combinations of merge with --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>
Techlive Zheng committed
Nov 12, 2015 at 20:32 UTC
4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6
1 file changed
+12
-1
contrib/subtree/t/t7900-subtree.sh
+12
-1
@@ -210,11 +210,22 @@ test_expect_success 'check if --message for merge works with squash too' '
210
211
test_expect_success 'merge new subproj history into subdir' '
212
git subtree merge --prefix="sub dir" FETCH_HEAD &&
213
- git branch pre-split &&
213
check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline" &&
214
undo
215
'
216
217
+test_expect_success 'merge new subproj history into subdir/ with --prefix and --message' '
218
+ git subtree merge --prefix="sub dir" --message="Merged changes from subproject" FETCH_HEAD &&
219
+ check_equal "$(last_commit_message)" "Merged changes from subproject" &&
220
+ undo
221
+'
222
+
223
+test_expect_success 'merge new subproj history into subdir/ with --squash and --prefix and --message' '
224
+ git subtree merge --prefix="sub dir" --message="Merged changes from subproject using squash" --squash FETCH_HEAD &&
225
+ check_equal "$(last_commit_message)" "Merged changes from subproject using squash" &&
226
+ undo
227
+'
228
+
229
test_expect_success 'split requires option --prefix' '
230
echo "You must provide the --prefix option." > expected &&
231
test_must_fail git subtree split > actual 2>&1 &&