mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cb/subtree-tests-update'

Browse Source 
Tests update in contrib/subtree.

* cb/subtree-tests-update:
  contrib/subtree: small tidy-up to test
  contrib/subtree: fix broken &&-chains and revealed test error
  contrib/subtree: use tabs consitently for indentation in tests
This commit is contained in:
Junio C Hamano
2015-07-10 14:17:56 -07:00
parent 615eb98a83 edc8f710c7
commit 3cbb92054b
1 changed files with 150 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,7 +177,8 @@ test_expect_success 'check if --message for merge works with squash too' '
test_expect_success 'merge new subproj history into subdir' ' test_expect_success 'merge new subproj history into subdir' '
git subtree merge --prefix=subdir FETCH_HEAD && git subtree merge --prefix=subdir FETCH_HEAD &&
git branch pre-split && git branch pre-split &&
check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline" check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline" &&
undo
' '
test_expect_success 'Check that prefix argument is required for split' ' test_expect_success 'Check that prefix argument is required for split' '
@ -218,12 +219,9 @@ test_expect_success 'check split with --branch' '
test_expect_success 'check hash of split' ' test_expect_success 'check hash of split' '
spl1=$(git subtree split --prefix subdir) && spl1=$(git subtree split --prefix subdir) &&
undo &&
git subtree split --prefix subdir --branch splitbr1test && git subtree split --prefix subdir --branch splitbr1test &&
check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1" check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1" &&
git checkout splitbr1test && new_hash=$(git rev-parse splitbr1test~2) &&
new_hash=$(git rev-parse HEAD~2) &&
git checkout mainline &&
check_equal ''"$new_hash"'' "$subdir_hash" check_equal ''"$new_hash"'' "$subdir_hash"
' '
@ -269,7 +267,7 @@ test_expect_success 'add sub9' '
cd .. cd ..
test_expect_success 'split for sub8' ' test_expect_success 'split for sub8' '
split2=''"$(git subtree split --annotate='"'*'"' --prefix subdir/ --rejoin)"'' split2=''"$(git subtree split --annotate='"'*'"' --prefix subdir/ --rejoin)"'' &&
git branch split2 "$split2" git branch split2 "$split2"
' '