Add a 'create' helper function in test.sh.

diff --git a/test.sh b/test.sh
index 85ed7ce549be94c6fc33a6bcbfd16d5d81a03bda..276f40d1daffe3157baa886232510a154d32678c 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -1,13 +1,13 @@
 #!/bin/bash -x
 #!/bin/bash -x

+. shellopts.sh
+set -e
+

 create()
 {
 create()
 {

-       for d in 1 2 3 4 5 6 7 8 9 10; do
-               echo "$1"
-       done >"$1"
+       echo "$1" >"$1"
+       git add "$1"

 }
 
 }
 

-. shellopts.sh
-set -e

 
 rm -rf mainline subproj
 mkdir mainline subproj
 
 rm -rf mainline subproj
 mkdir mainline subproj


@@ -16,25 +16,21 @@ cd subproj
 git init
 
 create sub1
 git init
 
 create sub1

-git add sub1

 git commit -m 'sub1'
 git branch sub1
 git branch -m master subproj
 
 create sub2
 git commit -m 'sub1'
 git branch sub1
 git branch -m master subproj
 
 create sub2

-git add sub2

 git commit -m 'sub2'
 git branch sub2
 
 create sub3
 git commit -m 'sub2'
 git branch sub2
 
 create sub3

-git add sub3

 git commit -m 'sub3'
 git branch sub3
 
 cd ../mainline
 git init
 create main4
 git commit -m 'sub3'
 git branch sub3
 
 cd ../mainline
 git init
 create main4

-git add main4

 git commit -m 'main4'
 git branch -m master mainline
 
 git commit -m 'main4'
 git branch -m master mainline
 


@@ -46,15 +42,12 @@ git subtree add --prefix=subdir FETCH_HEAD
 git merge -m 'merge -s -ours' -s ours FETCH_HEAD
 
 create subdir/main-sub5
 git merge -m 'merge -s -ours' -s ours FETCH_HEAD
 
 create subdir/main-sub5

-git add subdir/main-sub5

 git commit -m 'main-sub5'
 
 create main6
 git commit -m 'main-sub5'
 
 create main6

-git add main6

 git commit -m 'main6 boring'
 
 create subdir/main-sub7
 git commit -m 'main6 boring'
 
 create subdir/main-sub7

-git add subdir/main-sub7

 git commit -m 'main-sub7'
 
 git fetch ../subproj sub2
 git commit -m 'main-sub7'
 
 git fetch ../subproj sub2


@@ -67,7 +60,6 @@ echo "split1={$split1}"
 git branch split1 "$split1"
 
 create subdir/main-sub8
 git branch split1 "$split1"
 
 create subdir/main-sub8

-git add subdir/main-sub8

 git commit -m 'main-sub8'
 
 cd ../subproj
 git commit -m 'main-sub8'
 
 cd ../subproj


@@ -76,7 +68,6 @@ git branch split1 FETCH_HEAD
 git merge FETCH_HEAD
 
 create sub9
 git merge FETCH_HEAD
 
 create sub9

-git add sub9

 git commit -m 'sub9'
 
 cd ../mainline
 git commit -m 'sub9'
 
 cd ../mainline


@@ -84,7 +75,6 @@ split2=$(git subtree split --annotate='*' --prefix subdir --rejoin)
 git branch split2 "$split2"
 
 create subdir/main-sub10
 git branch split2 "$split2"
 
 create subdir/main-sub10

-git add subdir/main-sub10

 git commit -m 'main-sub10'
 
 split3=$(git subtree split --annotate='*' --prefix subdir --rejoin)
 git commit -m 'main-sub10'
 
 split3=$(git subtree split --annotate='*' --prefix subdir --rejoin)