Permalink
Browse files

[TEST] Add subtree and immediately push.

Passes on current (2793ee6) apenwarr and current (29922dd) rentzsch forks.
Fails on current (3dc509b) helmo fork.
  • Loading branch information...
1 parent 29922dd commit 5486228071a5347382ceec95fe449cdfa5e8b36a @rentzsch committed Apr 30, 2012
Showing with 21 additions and 1 deletion.
  1. +21 −1 test.sh
View
22 test.sh
@@ -378,5 +378,25 @@ make_submodule()
#
# rm -rf ../submodule.*
+
+# Simple subtree add-and-immediately-push test:
+echo
+echo '*** TESTING add subtree and immediately push'
+echo
+
+cd .. # return to test dir top level
+rm -rf mainline2
+git init mainline2
+cd mainline2
+date > mainline2.txt && git add . && git commit -m "initial mainline2 commit"
+git subtree add --prefix=subproj ../subproj subproj
+git subtree push --prefix=subproj ../subproj subproj
+result=$?
+cd ..
+check_equal 0 "$result"
+
echo
-echo 'ok'
+echo '*** PASSED add subtree and immediately push'
+echo
+
+echo '*** ALL TESTS PASSED ***'

0 comments on commit 5486228

Please sign in to comment.