blob: b697a4498b2f97ed635932a0b4b45dfca904754b (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
#!/bin/bash
here=$(dirname $0)
tag () {
git tag "$@"
echo -n "Hit Enter to continue ..."
read
}
test_repo=$here/test-repo
rm -rf $test_repo
mkdir $test_repo
cd $test_repo
git init
git config user.email git-deps-test@fake.address
# Start with three independently committed files
cat <<EOF > one
one
two
three
four
five
six
seven
eight
nine
ten
EOF
git add one
git commit -m 'one'
tag one
for f in two; do
cp one $f
git add $f
git commit -m "$f"
tag "$f"
done
# Now start making changes
sed -i 's/three/three a/' one
git commit -am 'one: change three to three a'
tag one-three-a # depends on one
sed -i 's/three/three a/' two
git commit -am 'two: change three to three a'
tag two-three-a # depends on two
# Change non-overlapping part of previously changed file
sed -i 's/eight/eight a/' one
git commit -am 'one: change eight to eight a'
tag one-eight-a # depends on one
# Change previously changed line
sed -i 's/three a/three b/' one
git commit -am 'one: change three a to three b'
tag one-three-b # depends on one-three-a
|
