Add a 'create' helper function in test.sh.
Avery Pennarun committed
Apr 26, 2009 at 15:55 UTC
0ad3dd8534215648e381663979ea99db855578b6
1 file changed
+5
-15
test.sh
+5
-15
@@ -1,13 +1,13 @@
1
#!/bin/bash -x
2
+. shellopts.sh
3
+set -e
4
+
5
create()
6
{
4
- for d in 1 2 3 4 5 6 7 8 9 10; do
5
- echo "$1"
6
- done >"$1"
7
+ echo "$1" >"$1"
8
+ git add "$1"
9
}
10
9
-. shellopts.sh
10
-set -e
11
12
rm -rf mainline subproj
13
mkdir mainline subproj
@@ -16,25 +16,21 @@ cd subproj
16
git init
17
18
create sub1
19
-git add sub1
19
git commit -m 'sub1'
20
git branch sub1
21
git branch -m master subproj
22
23
create sub2
25
-git add sub2
24
git commit -m 'sub2'
25
git branch sub2
26
27
create sub3
30
-git add sub3
28
git commit -m 'sub3'
29
git branch sub3
30
31
cd ../mainline
32
git init
33
create main4
37
-git add main4
34
git commit -m 'main4'
35
git branch -m master mainline
36
@@ -46,15 +42,12 @@ git subtree add --prefix=subdir FETCH_HEAD
42
git merge -m 'merge -s -ours' -s ours FETCH_HEAD
43
44
create subdir/main-sub5
49
-git add subdir/main-sub5
45
git commit -m 'main-sub5'
46
47
create main6
53
-git add main6
48
git commit -m 'main6 boring'
49
50
create subdir/main-sub7
57
-git add subdir/main-sub7
51
git commit -m 'main-sub7'
52
53
git fetch ../subproj sub2
@@ -67,7 +60,6 @@ echo "split1={$split1}"
60
git branch split1 "$split1"
61
62
create subdir/main-sub8
70
-git add subdir/main-sub8
63
git commit -m 'main-sub8'
64
65
cd ../subproj
@@ -76,7 +68,6 @@ git branch split1 FETCH_HEAD
68
git merge FETCH_HEAD
69
70
create sub9
79
-git add sub9
71
git commit -m 'sub9'
72
73
cd ../mainline
@@ -84,7 +75,6 @@ split2=$(git subtree split --annotate='*' --prefix subdir --rejoin)
75
git branch split2 "$split2"
76
77
create subdir/main-sub10
87
-git add subdir/main-sub10
78
git commit -m 'main-sub10'
79
80
split3=$(git subtree split --annotate='*' --prefix subdir --rejoin)