undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change test.sh to test the new add, merge, and pull commands.

Browse Source
This commit is contained in:
Avery Pennarun 2009-04-25 00:07:04 -04:00
parent b9de53532c
commit a13a299996
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test.sh
View File

@ -33,13 +33,9 @@ git branch -m master mainline
git fetch ../subproj sub1 git fetch ../subproj sub1
git branch sub1 FETCH_HEAD git branch sub1 FETCH_HEAD
git read-tree --prefix=subdir FETCH_HEAD git subtree add --prefix=subdir FETCH_HEAD
git checkout subdir
tree=$(git write-tree)
com=$(echo initial-subdir-merge | git commit-tree $tree -p HEAD -p FETCH_HEAD)
git reset $com
#git commit -m 'initial-subdir-merge'
# this shouldn't actually do anything, since FETCH_HEAD is already a parent
git merge -m 'merge -s -ours' -s ours FETCH_HEAD git merge -m 'merge -s -ours' -s ours FETCH_HEAD
touch subdir/main-sub3 touch subdir/main-sub3
@ -56,7 +52,7 @@ git commit -m 'main-sub4'
git fetch ../subproj sub2 git fetch ../subproj sub2
git branch sub2 FETCH_HEAD git branch sub2 FETCH_HEAD
git merge -s subtree FETCH_HEAD git subtree merge --prefix=subdir FETCH_HEAD
git branch pre-split git branch pre-split
split1=$(git subtree split --prefix subdir --onto FETCH_HEAD --rejoin) split1=$(git subtree split --prefix subdir --onto FETCH_HEAD --rejoin)
@ -96,4 +92,4 @@ git branch subproj-merge-split3
cd ../mainline cd ../mainline
git fetch ../subproj subproj-merge-split3 git fetch ../subproj subproj-merge-split3
git branch subproj-merge-split3 FETCH_HEAD git branch subproj-merge-split3 FETCH_HEAD
git merge -s subtree subproj-merge-split3 git subtree pull --prefix=subdir ../subproj subproj-merge-split3