Merge branch 'maint'
[git/jnareb-git.git] / t / t7003-filter-branch.sh
blobb0a9d7d536314ec842b141c09ba0d6f8b06b6288
1 #!/bin/sh
3 test_description='git filter-branch'
4 . ./test-lib.sh
6 make_commit () {
7 lower=$(echo $1 | tr '[A-Z]' '[a-z]')
8 echo $lower > $lower
9 git add $lower
10 test_tick
11 git commit -m $1
12 git tag $1
15 test_expect_success 'setup' '
16 make_commit A
17 make_commit B
18 git checkout -b branch B
19 make_commit D
20 mkdir dir
21 make_commit dir/D
22 make_commit E
23 git checkout master
24 make_commit C
25 git checkout branch
26 git merge C
27 git tag F
28 make_commit G
29 make_commit H
32 H=$(git rev-parse H)
34 test_expect_success 'rewrite identically' '
35 git filter-branch branch
37 test_expect_success 'result is really identical' '
38 test $H = $(git rev-parse HEAD)
41 test_expect_success 'rewrite bare repository identically' '
42 (git config core.bare true && cd .git && git filter-branch branch)
44 git config core.bare false
45 test_expect_success 'result is really identical' '
46 test $H = $(git rev-parse HEAD)
49 test_expect_success 'rewrite, renaming a specific file' '
50 git filter-branch -f --tree-filter "mv d doh || :" HEAD
53 test_expect_success 'test that the file was renamed' '
54 test d = "$(git show HEAD:doh --)" &&
55 ! test -f d &&
56 test -f doh &&
57 test d = "$(cat doh)"
60 test_expect_success 'rewrite, renaming a specific directory' '
61 git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
64 test_expect_success 'test that the directory was renamed' '
65 test dir/d = "$(git show HEAD:diroh/d --)" &&
66 ! test -d dir &&
67 test -d diroh &&
68 ! test -d diroh/dir &&
69 test -f diroh/d &&
70 test dir/d = "$(cat diroh/d)"
73 git tag oldD HEAD~4
74 test_expect_success 'rewrite one branch, keeping a side branch' '
75 git branch modD oldD &&
76 git filter-branch -f --tree-filter "mv b boh || :" D..modD
79 test_expect_success 'common ancestor is still common (unchanged)' '
80 test "$(git merge-base modD D)" = "$(git rev-parse B)"
83 test_expect_success 'filter subdirectory only' '
84 mkdir subdir &&
85 touch subdir/new &&
86 git add subdir/new &&
87 test_tick &&
88 git commit -m "subdir" &&
89 echo H > a &&
90 test_tick &&
91 git commit -m "not subdir" a &&
92 echo A > subdir/new &&
93 test_tick &&
94 git commit -m "again subdir" subdir/new &&
95 git rm a &&
96 test_tick &&
97 git commit -m "again not subdir" &&
98 git branch sub &&
99 git branch sub-earlier HEAD~2 &&
100 git filter-branch -f --subdirectory-filter subdir \
101 refs/heads/sub refs/heads/sub-earlier
104 test_expect_success 'subdirectory filter result looks okay' '
105 test 2 = $(git rev-list sub | wc -l) &&
106 git show sub:new &&
107 test_must_fail git show sub:subdir &&
108 git show sub-earlier:new &&
109 test_must_fail git show sub-earlier:subdir
112 test_expect_success 'more setup' '
113 git checkout master &&
114 mkdir subdir &&
115 echo A > subdir/new &&
116 git add subdir/new &&
117 test_tick &&
118 git commit -m "subdir on master" subdir/new &&
119 git rm a &&
120 test_tick &&
121 git commit -m "again subdir on master" &&
122 git merge branch
125 test_expect_success 'use index-filter to move into a subdirectory' '
126 git branch directorymoved &&
127 git filter-branch -f --index-filter \
128 "git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
129 GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
130 git update-index --index-info &&
131 mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
132 test -z "$(git diff HEAD directorymoved:newsubdir)"'
134 test_expect_success 'stops when msg filter fails' '
135 old=$(git rev-parse HEAD) &&
136 test_must_fail git filter-branch -f --msg-filter false HEAD &&
137 test $old = $(git rev-parse HEAD) &&
138 rm -rf .git-rewrite
141 test_expect_success 'author information is preserved' '
142 : > i &&
143 git add i &&
144 test_tick &&
145 GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
146 git branch preserved-author &&
147 git filter-branch -f --msg-filter "cat; \
148 test \$GIT_COMMIT != $(git rev-parse master) || \
149 echo Hallo" \
150 preserved-author &&
151 test 1 = $(git rev-list --author="B V Uips" preserved-author | wc -l)
154 test_expect_success "remove a certain author's commits" '
155 echo i > i &&
156 test_tick &&
157 git commit -m i i &&
158 git branch removed-author &&
159 git filter-branch -f --commit-filter "\
160 if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
161 then\
162 skip_commit \"\$@\";
163 else\
164 git commit-tree \"\$@\";\
165 fi" removed-author &&
166 cnt1=$(git rev-list master | wc -l) &&
167 cnt2=$(git rev-list removed-author | wc -l) &&
168 test $cnt1 -eq $(($cnt2 + 1)) &&
169 test 0 = $(git rev-list --author="B V Uips" removed-author | wc -l)
172 test_expect_success 'barf on invalid name' '
173 test_must_fail git filter-branch -f master xy-problem &&
174 test_must_fail git filter-branch -f HEAD^
177 test_expect_success '"map" works in commit filter' '
178 git filter-branch -f --commit-filter "\
179 parent=\$(git rev-parse \$GIT_COMMIT^) &&
180 mapped=\$(map \$parent) &&
181 actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
182 test \$mapped = \$actual &&
183 git commit-tree \"\$@\";" master~2..master &&
184 git rev-parse --verify master
187 test_expect_success 'Name needing quotes' '
189 git checkout -b rerere A &&
190 mkdir foo &&
191 name="れれれ" &&
192 >foo/$name &&
193 git add foo &&
194 git commit -m "Adding a file" &&
195 git filter-branch --tree-filter "rm -fr foo" &&
196 test_must_fail git ls-files --error-unmatch "foo/$name" &&
197 test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
201 test_expect_success 'Subdirectory filter with disappearing trees' '
202 git reset --hard &&
203 git checkout master &&
205 mkdir foo &&
206 touch foo/bar &&
207 git add foo &&
208 test_tick &&
209 git commit -m "Adding foo" &&
211 git rm -r foo &&
212 test_tick &&
213 git commit -m "Removing foo" &&
215 mkdir foo &&
216 touch foo/bar &&
217 git add foo &&
218 test_tick &&
219 git commit -m "Re-adding foo" &&
221 git filter-branch -f --subdirectory-filter foo &&
222 test $(git rev-list master | wc -l) = 3
225 test_expect_success 'Tag name filtering retains tag message' '
226 git tag -m atag T &&
227 git cat-file tag T > expect &&
228 git filter-branch -f --tag-name-filter cat &&
229 git cat-file tag T > actual &&
230 test_cmp expect actual
233 faux_gpg_tag='object XXXXXX
234 type commit
235 tag S
236 tagger T A Gger <tagger@example.com> 1206026339 -0500
238 This is a faux gpg signed tag.
239 -----BEGIN PGP SIGNATURE-----
240 Version: FauxGPG v0.0.0 (FAUX/Linux)
242 gdsfoewhxu/6l06f1kxyxhKdZkrcbaiOMtkJUA9ITAc1mlamh0ooasxkH1XwMbYQ
243 acmwXaWET20H0GeAGP+7vow=
244 =agpO
245 -----END PGP SIGNATURE-----
247 test_expect_success 'Tag name filtering strips gpg signature' '
248 sha1=$(git rev-parse HEAD) &&
249 sha1t=$(echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | git mktag) &&
250 git update-ref "refs/tags/S" "$sha1t" &&
251 echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | head -n 6 > expect &&
252 git filter-branch -f --tag-name-filter cat &&
253 git cat-file tag S > actual &&
254 test_cmp expect actual
257 test_expect_success 'Tag name filtering allows slashes in tag names' '
258 git tag -m tag-with-slash X/1 &&
259 git cat-file tag X/1 | sed -e s,X/1,X/2, > expect &&
260 git filter-branch -f --tag-name-filter "echo X/2" &&
261 git cat-file tag X/2 > actual &&
262 test_cmp expect actual
265 test_done