Merge branch 'jc/maint-1.6.0-blame-s' into maint
[git] / t / t5515-fetch-merge-logic.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2007 Santi BĂ©jar, based on t4013 by Junio C Hamano
4 #
5 #
6
7 test_description='Merge logic in fetch'
8
9 . ./test-lib.sh
10
11 LF='
12 '
13
14 test_expect_success setup '
15         GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
16         GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
17         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
18
19         echo >file original &&
20         git add file &&
21         git commit -a -m One &&
22         git tag tag-one &&
23         git tag tag-one-tree HEAD^{tree} &&
24         git branch one &&
25
26         echo two >> file &&
27         git commit -a -m Two &&
28         git tag -a -m "Tag Two" tag-two &&
29         git branch two &&
30
31         echo three >> file &&
32         git commit -a -m Three &&
33         git tag -a -m "Tag Three" tag-three &&
34         git tag -a -m "Tag Three file" tag-three-file HEAD^{tree}:file &&
35         git branch three &&
36
37         echo master >> file &&
38         git commit -a -m Master &&
39         git tag -a -m "Tag Master" tag-master &&
40
41         git checkout three &&
42
43         git clone . cloned &&
44         cd cloned &&
45         git config remote.origin.url ../.git/ &&
46
47         git config remote.config-explicit.url ../.git/ &&
48         git config remote.config-explicit.fetch refs/heads/master:remotes/rem/master &&
49         git config --add remote.config-explicit.fetch refs/heads/one:remotes/rem/one &&
50         git config --add remote.config-explicit.fetch two:remotes/rem/two &&
51         git config --add remote.config-explicit.fetch refs/heads/three:remotes/rem/three &&
52         remotes="config-explicit" &&
53
54         git config remote.config-glob.url ../.git/ &&
55         git config remote.config-glob.fetch refs/heads/*:refs/remotes/rem/* &&
56         remotes="$remotes config-glob" &&
57
58         mkdir -p .git/remotes &&
59         {
60                 echo "URL: ../.git/"
61                 echo "Pull: refs/heads/master:remotes/rem/master"
62                 echo "Pull: refs/heads/one:remotes/rem/one"
63                 echo "Pull: two:remotes/rem/two"
64                 echo "Pull: refs/heads/three:remotes/rem/three"
65         } >.git/remotes/remote-explicit &&
66         remotes="$remotes remote-explicit" &&
67
68         {
69                 echo "URL: ../.git/"
70                 echo "Pull: refs/heads/*:refs/remotes/rem/*"
71         } >.git/remotes/remote-glob &&
72         remotes="$remotes remote-glob" &&
73
74         mkdir -p .git/branches &&
75         echo "../.git" > .git/branches/branches-default &&
76         remotes="$remotes branches-default" &&
77
78         echo "../.git#one" > .git/branches/branches-one &&
79         remotes="$remotes branches-one" &&
80
81         for remote in $remotes ; do
82                 git config branch.br-$remote.remote $remote &&
83                 git config branch.br-$remote-merge.remote $remote &&
84                 git config branch.br-$remote-merge.merge refs/heads/three &&
85                 git config branch.br-$remote-octopus.remote $remote &&
86                 git config branch.br-$remote-octopus.merge refs/heads/one &&
87                 git config --add branch.br-$remote-octopus.merge two
88         done
89 '
90
91 # Merge logic depends on branch properties and Pull: or .fetch lines
92 for remote in $remotes ; do
93     for branch in "" "-merge" "-octopus" ; do
94 cat <<EOF
95 br-$remote$branch
96 br-$remote$branch $remote
97 EOF
98     done
99 done > tests
100
101 # Merge logic does not depend on branch properties,
102 # but does depend on Pull: or fetch lines.
103 # Use two branches completely unrelated from the arguments,
104 # the clone default and one without branch properties
105 for branch in master br-unconfig ; do
106     echo $branch
107     for remote in $remotes ; do
108         echo $branch $remote
109     done
110 done >> tests
111
112 # Merge logic does not depend on branch properties
113 # neither in the Pull: or .fetch config
114 for branch in master br-unconfig ; do
115     cat <<EOF
116 $branch ../.git
117 $branch ../.git one
118 $branch ../.git one two
119 $branch --tags ../.git
120 $branch ../.git tag tag-one tag tag-three
121 $branch ../.git tag tag-one-tree tag tag-three-file
122 $branch ../.git one tag tag-one tag tag-three-file
123 EOF
124 done >> tests
125
126 while read cmd
127 do
128         case "$cmd" in
129         '' | '#'*) continue ;;
130         esac
131         test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
132         cnt=`expr $test_count + 1`
133         pfx=`printf "%04d" $cnt`
134         expect_f="$TEST_DIRECTORY/t5515/fetch.$test"
135         actual_f="$pfx-fetch.$test"
136         expect_r="$TEST_DIRECTORY/t5515/refs.$test"
137         actual_r="$pfx-refs.$test"
138
139         test_expect_success "$cmd" '
140                 {
141                         echo "# $cmd"
142                         set x $cmd; shift
143                         git symbolic-ref HEAD refs/heads/$1 ; shift
144                         rm -f .git/FETCH_HEAD
145                         git for-each-ref \
146                                 refs/heads refs/remotes/rem refs/tags |
147                         while read val type refname
148                         do
149                                 git update-ref -d "$refname" "$val"
150                         done
151                         git fetch "$@" >/dev/null
152                         cat .git/FETCH_HEAD
153                 } >"$actual_f" &&
154                 git show-ref >"$actual_r" &&
155                 if test -f "$expect_f"
156                 then
157                         test_cmp "$expect_f" "$actual_f" &&
158                         rm -f "$actual_f"
159                 else
160                         # this is to help developing new tests.
161                         cp "$actual_f" "$expect_f"
162                         false
163                 fi &&
164                 if test -f "$expect_r"
165                 then
166                         test_cmp "$expect_r" "$actual_r" &&
167                         rm -f "$actual_r"
168                 else
169                         # this is to help developing new tests.
170                         cp "$actual_r" "$expect_r"
171                         false
172                 fi
173         '
174 done < tests
175
176 test_done