]>
Commit | Line | Data |
---|---|---|
6f6826c5 JS |
1 | #!/bin/sh |
2 | # | |
3 | # Rewrite revision history | |
4 | # Copyright (c) Petr Baudis, 2006 | |
5 | # Minimal changes to "port" it to core-git (c) Johannes Schindelin, 2007 | |
6 | # | |
c401b33c JS |
7 | # Lets you rewrite the revision history of the current branch, creating |
8 | # a new branch. You can specify a number of filters to modify the commits, | |
9 | # files and trees. | |
6f6826c5 | 10 | |
16ed34ad JS |
11 | # The following functions will also be available in the commit filter: |
12 | ||
13 | functions=$(cat << \EOF | |
b5669a05 | 14 | warn () { |
285c6cbf | 15 | echo "$*" >&2 |
b5669a05 SP |
16 | } |
17 | ||
6f6826c5 JS |
18 | map() |
19 | { | |
3520e1e8 | 20 | # if it was not rewritten, take the original |
c57a3494 JS |
21 | if test -r "$workdir/../map/$1" |
22 | then | |
23 | cat "$workdir/../map/$1" | |
24 | else | |
25 | echo "$1" | |
26 | fi | |
6f6826c5 JS |
27 | } |
28 | ||
f95eef15 JS |
29 | # if you run 'skip_commit "$@"' in a commit filter, it will print |
30 | # the (mapped) parents, effectively skipping the commit. | |
31 | ||
32 | skip_commit() | |
33 | { | |
34 | shift; | |
35 | while [ -n "$1" ]; | |
36 | do | |
37 | shift; | |
38 | map "$1"; | |
39 | shift; | |
40 | done; | |
41 | } | |
42 | ||
d3240d93 PH |
43 | # if you run 'git_commit_non_empty_tree "$@"' in a commit filter, |
44 | # it will skip commits that leave the tree untouched, commit the other. | |
45 | git_commit_non_empty_tree() | |
46 | { | |
47 | if test $# = 3 && test "$1" = $(git rev-parse "$3^{tree}"); then | |
48 | map "$3" | |
49 | else | |
50 | git commit-tree "$@" | |
51 | fi | |
52 | } | |
8c1ce0f4 JS |
53 | # override die(): this version puts in an extra line break, so that |
54 | # the progress is still visible | |
55 | ||
56 | die() | |
57 | { | |
58 | echo >&2 | |
59 | echo "$*" >&2 | |
60 | exit 1 | |
61 | } | |
16ed34ad JS |
62 | EOF |
63 | ) | |
64 | ||
65 | eval "$functions" | |
8c1ce0f4 | 66 | |
6f6826c5 JS |
67 | # When piped a commit, output a script to set the ident of either |
68 | # "author" or "committer | |
69 | ||
70 | set_ident () { | |
40a7ce64 JK |
71 | lid="$(echo "$1" | tr "[A-Z]" "[a-z]")" |
72 | uid="$(echo "$1" | tr "[a-z]" "[A-Z]")" | |
6f6826c5 JS |
73 | pick_id_script=' |
74 | /^'$lid' /{ | |
75 | s/'\''/'\''\\'\'\''/g | |
76 | h | |
77 | s/^'$lid' \([^<]*\) <[^>]*> .*$/\1/ | |
78 | s/'\''/'\''\'\'\''/g | |
3addc94a | 79 | s/.*/GIT_'$uid'_NAME='\''&'\''; export GIT_'$uid'_NAME/p |
6f6826c5 JS |
80 | |
81 | g | |
82 | s/^'$lid' [^<]* <\([^>]*\)> .*$/\1/ | |
83 | s/'\''/'\''\'\'\''/g | |
3addc94a | 84 | s/.*/GIT_'$uid'_EMAIL='\''&'\''; export GIT_'$uid'_EMAIL/p |
6f6826c5 JS |
85 | |
86 | g | |
87 | s/^'$lid' [^<]* <[^>]*> \(.*\)$/\1/ | |
88 | s/'\''/'\''\'\'\''/g | |
3addc94a | 89 | s/.*/GIT_'$uid'_DATE='\''&'\''; export GIT_'$uid'_DATE/p |
6f6826c5 JS |
90 | |
91 | q | |
92 | } | |
93 | ' | |
94 | ||
95 | LANG=C LC_ALL=C sed -ne "$pick_id_script" | |
96 | # Ensure non-empty id name. | |
3addc94a | 97 | echo "case \"\$GIT_${uid}_NAME\" in \"\") GIT_${uid}_NAME=\"\${GIT_${uid}_EMAIL%%@*}\" && export GIT_${uid}_NAME;; esac" |
6f6826c5 JS |
98 | } |
99 | ||
83e355a6 | 100 | USAGE="[--env-filter <command>] [--tree-filter <command>] |
9dcca58d JH |
101 | [--index-filter <command>] [--parent-filter <command>] |
102 | [--msg-filter <command>] [--commit-filter <command>] | |
103 | [--tag-name-filter <command>] [--subdirectory-filter <directory>] | |
104 | [--original <namespace>] [-d <directory>] [-f | --force] | |
105 | [<rev-list options>...]" | |
7e0f1704 | 106 | |
8f321a39 | 107 | OPTIONS_SPEC= |
7e0f1704 JS |
108 | . git-sh-setup |
109 | ||
a4661b01 | 110 | if [ "$(is_bare_repository)" = false ]; then |
5347a50f | 111 | require_clean_work_tree 'rewrite branches' |
a4661b01 | 112 | fi |
46eb449c | 113 | |
6f6826c5 | 114 | tempdir=.git-rewrite |
6f6826c5 JS |
115 | filter_env= |
116 | filter_tree= | |
117 | filter_index= | |
118 | filter_parent= | |
119 | filter_msg=cat | |
d3240d93 | 120 | filter_commit= |
6f6826c5 | 121 | filter_tag_name= |
685ef546 | 122 | filter_subdir= |
dfd05e38 JS |
123 | orig_namespace=refs/original/ |
124 | force= | |
d3240d93 | 125 | prune_empty= |
f2f3a6b8 | 126 | remap_to_ancestor= |
822f7c73 | 127 | while : |
6f6826c5 JS |
128 | do |
129 | case "$1" in | |
130 | --) | |
131 | shift | |
132 | break | |
133 | ;; | |
dfd05e38 JS |
134 | --force|-f) |
135 | shift | |
136 | force=t | |
137 | continue | |
138 | ;; | |
f2f3a6b8 | 139 | --remap-to-ancestor) |
7ec344d8 | 140 | # deprecated ($remap_to_ancestor is set now automatically) |
f2f3a6b8 TR |
141 | shift |
142 | remap_to_ancestor=t | |
143 | continue | |
144 | ;; | |
d3240d93 PH |
145 | --prune-empty) |
146 | shift | |
147 | prune_empty=t | |
148 | continue | |
149 | ;; | |
6f6826c5 JS |
150 | -*) |
151 | ;; | |
152 | *) | |
153 | break; | |
154 | esac | |
155 | ||
156 | # all switches take one argument | |
157 | ARG="$1" | |
158 | case "$#" in 1) usage ;; esac | |
159 | shift | |
160 | OPTARG="$1" | |
161 | shift | |
162 | ||
163 | case "$ARG" in | |
164 | -d) | |
165 | tempdir="$OPTARG" | |
166 | ;; | |
6f6826c5 JS |
167 | --env-filter) |
168 | filter_env="$OPTARG" | |
169 | ;; | |
170 | --tree-filter) | |
171 | filter_tree="$OPTARG" | |
172 | ;; | |
173 | --index-filter) | |
174 | filter_index="$OPTARG" | |
175 | ;; | |
176 | --parent-filter) | |
177 | filter_parent="$OPTARG" | |
178 | ;; | |
179 | --msg-filter) | |
180 | filter_msg="$OPTARG" | |
181 | ;; | |
182 | --commit-filter) | |
16ed34ad | 183 | filter_commit="$functions; $OPTARG" |
6f6826c5 JS |
184 | ;; |
185 | --tag-name-filter) | |
186 | filter_tag_name="$OPTARG" | |
187 | ;; | |
685ef546 JS |
188 | --subdirectory-filter) |
189 | filter_subdir="$OPTARG" | |
f2f3a6b8 | 190 | remap_to_ancestor=t |
685ef546 | 191 | ;; |
dfd05e38 | 192 | --original) |
55ced83d | 193 | orig_namespace=$(expr "$OPTARG/" : '\(.*[^/]\)/*$')/ |
dfd05e38 | 194 | ;; |
6f6826c5 JS |
195 | *) |
196 | usage | |
197 | ;; | |
198 | esac | |
199 | done | |
200 | ||
d3240d93 PH |
201 | case "$prune_empty,$filter_commit" in |
202 | ,) | |
203 | filter_commit='git commit-tree "$@"';; | |
204 | t,) | |
205 | filter_commit="$functions;"' git_commit_non_empty_tree "$@"';; | |
206 | ,*) | |
207 | ;; | |
208 | *) | |
5da81713 | 209 | die "Cannot set --prune-empty and --commit-filter at the same time" |
d3240d93 PH |
210 | esac |
211 | ||
dfd05e38 JS |
212 | case "$force" in |
213 | t) | |
214 | rm -rf "$tempdir" | |
215 | ;; | |
216 | '') | |
217 | test -d "$tempdir" && | |
218 | die "$tempdir already exists, please remove it" | |
219 | esac | |
af580e9c | 220 | mkdir -p "$tempdir/t" && |
dfd05e38 | 221 | tempdir="$(cd "$tempdir"; pwd)" && |
af580e9c JS |
222 | cd "$tempdir/t" && |
223 | workdir="$(pwd)" || | |
224 | die "" | |
6f6826c5 | 225 | |
def16e71 BC |
226 | # Remove tempdir on exit |
227 | trap 'cd ../..; rm -rf "$tempdir"' 0 | |
228 | ||
88e38808 LN |
229 | ORIG_GIT_DIR="$GIT_DIR" |
230 | ORIG_GIT_WORK_TREE="$GIT_WORK_TREE" | |
231 | ORIG_GIT_INDEX_FILE="$GIT_INDEX_FILE" | |
232 | GIT_WORK_TREE=. | |
233 | export GIT_DIR GIT_WORK_TREE | |
234 | ||
dfd05e38 | 235 | # Make sure refs/original is empty |
0ea29cce | 236 | git for-each-ref > "$tempdir"/backup-refs || exit |
dfd05e38 JS |
237 | while read sha1 type name |
238 | do | |
239 | case "$force,$name" in | |
240 | ,$orig_namespace*) | |
734cd572 JT |
241 | die "Cannot create a new backup. |
242 | A previous backup already exists in $orig_namespace | |
243 | Force overwriting the backup with -f" | |
dfd05e38 JS |
244 | ;; |
245 | t,$orig_namespace*) | |
246 | git update-ref -d "$name" $sha1 | |
247 | ;; | |
248 | esac | |
249 | done < "$tempdir"/backup-refs | |
250 | ||
418fa3a5 | 251 | # The refs should be updated if their heads were rewritten |
0ea29cce EK |
252 | git rev-parse --no-flags --revs-only --symbolic-full-name \ |
253 | --default HEAD "$@" > "$tempdir"/raw-heads || exit | |
254 | sed -e '/^^/d' "$tempdir"/raw-heads >"$tempdir"/heads | |
dfd05e38 JS |
255 | |
256 | test -s "$tempdir"/heads || | |
257 | die "Which ref do you want to rewrite?" | |
258 | ||
3addc94a JS |
259 | GIT_INDEX_FILE="$(pwd)/../index" |
260 | export GIT_INDEX_FILE | |
6f6826c5 | 261 | |
af580e9c JS |
262 | # map old->new commit ids for rewriting parents |
263 | mkdir ../map || die "Could not create map/ directory" | |
6f6826c5 | 264 | |
2c1d2d81 TR |
265 | # we need "--" only if there are no path arguments in $@ |
266 | nonrevs=$(git rev-parse --no-revs "$@") || exit | |
7ec344d8 CH |
267 | if test -z "$nonrevs" |
268 | then | |
269 | dashdash=-- | |
270 | else | |
271 | dashdash= | |
272 | remap_to_ancestor=t | |
273 | fi | |
274 | ||
2c1d2d81 TR |
275 | rev_args=$(git rev-parse --revs-only "$@") |
276 | ||
685ef546 JS |
277 | case "$filter_subdir" in |
278 | "") | |
2c1d2d81 | 279 | eval set -- "$(git rev-parse --sq --no-revs "$@")" |
685ef546 JS |
280 | ;; |
281 | *) | |
2c1d2d81 TR |
282 | eval set -- "$(git rev-parse --sq --no-revs "$@" $dashdash \ |
283 | "$filter_subdir")" | |
284 | ;; | |
285 | esac | |
286 | ||
287 | git rev-list --reverse --topo-order --default HEAD \ | |
288 | --parents --simplify-merges $rev_args "$@" > ../revs || | |
289 | die "Could not get the commits" | |
9d6f220c | 290 | commits=$(wc -l <../revs | tr -d " ") |
6f6826c5 JS |
291 | |
292 | test $commits -eq 0 && die "Found nothing to rewrite" | |
293 | ||
dfd05e38 JS |
294 | # Rewrite the commits |
295 | ||
d5b0c97d | 296 | git_filter_branch__commit_count=0 |
813b4734 | 297 | while read commit parents; do |
d5b0c97d EN |
298 | git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1)) |
299 | printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)" | |
6f6826c5 | 300 | |
685ef546 JS |
301 | case "$filter_subdir" in |
302 | "") | |
5be60078 | 303 | git read-tree -i -m $commit |
685ef546 JS |
304 | ;; |
305 | *) | |
5b044ac3 JH |
306 | # The commit may not have the subdirectory at all |
307 | err=$(git read-tree -i -m $commit:"$filter_subdir" 2>&1) || { | |
d69da76d | 308 | if ! git rev-parse -q --verify $commit:"$filter_subdir" |
5b044ac3 JH |
309 | then |
310 | rm -f "$GIT_INDEX_FILE" | |
311 | else | |
312 | echo >&2 "$err" | |
313 | false | |
314 | fi | |
315 | } | |
af580e9c | 316 | esac || die "Could not initialize the index" |
6f6826c5 | 317 | |
3addc94a JS |
318 | GIT_COMMIT=$commit |
319 | export GIT_COMMIT | |
af580e9c JS |
320 | git cat-file commit "$commit" >../commit || |
321 | die "Cannot read commit $commit" | |
6f6826c5 | 322 | |
8c1ce0f4 JS |
323 | eval "$(set_ident AUTHOR <../commit)" || |
324 | die "setting author failed for commit $commit" | |
325 | eval "$(set_ident COMMITTER <../commit)" || | |
326 | die "setting committer failed for commit $commit" | |
327 | eval "$filter_env" < /dev/null || | |
328 | die "env filter failed: $filter_env" | |
6f6826c5 JS |
329 | |
330 | if [ "$filter_tree" ]; then | |
af580e9c JS |
331 | git checkout-index -f -u -a || |
332 | die "Could not checkout the index" | |
6f6826c5 JS |
333 | # files that $commit removed are now still in the working tree; |
334 | # remove them, else they would be added again | |
6a589fda | 335 | git clean -d -q -f -x |
8c1ce0f4 JS |
336 | eval "$filter_tree" < /dev/null || |
337 | die "tree filter failed: $filter_tree" | |
338 | ||
1fe32cb9 | 339 | ( |
03ca8395 | 340 | git diff-index -r --name-only --ignore-submodules $commit && |
1fe32cb9 | 341 | git ls-files --others |
0ea29cce EK |
342 | ) > "$tempdir"/tree-state || exit |
343 | git update-index --add --replace --remove --stdin \ | |
344 | < "$tempdir"/tree-state || exit | |
6f6826c5 JS |
345 | fi |
346 | ||
8c1ce0f4 JS |
347 | eval "$filter_index" < /dev/null || |
348 | die "index filter failed: $filter_index" | |
6f6826c5 JS |
349 | |
350 | parentstr= | |
813b4734 | 351 | for parent in $parents; do |
3520e1e8 JS |
352 | for reparent in $(map "$parent"); do |
353 | parentstr="$parentstr -p $reparent" | |
354 | done | |
6f6826c5 JS |
355 | done |
356 | if [ "$filter_parent" ]; then | |
8c1ce0f4 JS |
357 | parentstr="$(echo "$parentstr" | eval "$filter_parent")" || |
358 | die "parent filter failed: $filter_parent" | |
6f6826c5 JS |
359 | fi |
360 | ||
361 | sed -e '1,/^$/d' <../commit | \ | |
8c1ce0f4 JS |
362 | eval "$filter_msg" > ../message || |
363 | die "msg filter failed: $filter_msg" | |
0906f6e1 | 364 | workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ |
0ea29cce EK |
365 | $(git write-tree) $parentstr < ../message > ../map/$commit || |
366 | die "could not write rewritten commit" | |
6f6826c5 JS |
367 | done <../revs |
368 | ||
f2f3a6b8 TR |
369 | # If we are filtering for paths, as in the case of a subdirectory |
370 | # filter, it is possible that a specified head is not in the set of | |
371 | # rewritten commits, because it was pruned by the revision walker. | |
372 | # Ancestor remapping fixes this by mapping these heads to the unique | |
373 | # nearest ancestor that survived the pruning. | |
dfd05e38 | 374 | |
f2f3a6b8 | 375 | if test "$remap_to_ancestor" = t |
a0e46390 TR |
376 | then |
377 | while read ref | |
dfd05e38 | 378 | do |
a0e46390 TR |
379 | sha1=$(git rev-parse "$ref"^0) |
380 | test -f "$workdir"/../map/$sha1 && continue | |
2c1d2d81 | 381 | ancestor=$(git rev-list --simplify-merges -1 "$ref" "$@") |
a0e46390 TR |
382 | test "$ancestor" && echo $(map $ancestor) >> "$workdir"/../map/$sha1 |
383 | done < "$tempdir"/heads | |
384 | fi | |
dfd05e38 JS |
385 | |
386 | # Finally update the refs | |
387 | ||
388 | _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' | |
389 | _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" | |
dfd05e38 JS |
390 | echo |
391 | while read ref | |
392 | do | |
393 | # avoid rewriting a ref twice | |
394 | test -f "$orig_namespace$ref" && continue | |
395 | ||
396 | sha1=$(git rev-parse "$ref"^0) | |
397 | rewritten=$(map $sha1) | |
398 | ||
399 | test $sha1 = "$rewritten" && | |
400 | warn "WARNING: Ref '$ref' is unchanged" && | |
401 | continue | |
402 | ||
403 | case "$rewritten" in | |
404 | '') | |
405 | echo "Ref '$ref' was deleted" | |
406 | git update-ref -m "filter-branch: delete" -d "$ref" $sha1 || | |
407 | die "Could not delete $ref" | |
98409060 | 408 | ;; |
dfd05e38 JS |
409 | $_x40) |
410 | echo "Ref '$ref' was rewritten" | |
261044e8 TR |
411 | if ! git update-ref -m "filter-branch: rewrite" \ |
412 | "$ref" $rewritten $sha1 2>/dev/null; then | |
413 | if test $(git cat-file -t "$ref") = tag; then | |
414 | if test -z "$filter_tag_name"; then | |
415 | warn "WARNING: You said to rewrite tagged commits, but not the corresponding tag." | |
416 | warn "WARNING: Perhaps use '--tag-name-filter cat' to rewrite the tag." | |
417 | fi | |
418 | else | |
419 | die "Could not rewrite $ref" | |
420 | fi | |
421 | fi | |
98409060 | 422 | ;; |
dfd05e38 JS |
423 | *) |
424 | # NEEDSWORK: possibly add -Werror, making this an error | |
425 | warn "WARNING: '$ref' was rewritten into multiple commits:" | |
426 | warn "$rewritten" | |
427 | warn "WARNING: Ref '$ref' points to the first one now." | |
428 | rewritten=$(echo "$rewritten" | head -n 1) | |
429 | git update-ref -m "filter-branch: rewrite to first" \ | |
430 | "$ref" $rewritten $sha1 || | |
431 | die "Could not rewrite $ref" | |
432 | ;; | |
433 | esac | |
0ea29cce EK |
434 | git update-ref -m "filter-branch: backup" "$orig_namespace$ref" $sha1 || |
435 | exit | |
dfd05e38 JS |
436 | done < "$tempdir"/heads |
437 | ||
438 | # TODO: This should possibly go, with the semantics that all positive given | |
439 | # refs are updated, and their original heads stored in refs/original/ | |
440 | # Filter tags | |
6f6826c5 JS |
441 | |
442 | if [ "$filter_tag_name" ]; then | |
5be60078 | 443 | git for-each-ref --format='%(objectname) %(objecttype) %(refname)' refs/tags | |
6f6826c5 JS |
444 | while read sha1 type ref; do |
445 | ref="${ref#refs/tags/}" | |
446 | # XXX: Rewrite tagged trees as well? | |
447 | if [ "$type" != "commit" -a "$type" != "tag" ]; then | |
448 | continue; | |
449 | fi | |
450 | ||
451 | if [ "$type" = "tag" ]; then | |
452 | # Dereference to a commit | |
453 | sha1t="$sha1" | |
7bd93c1c | 454 | sha1="$(git rev-parse -q "$sha1"^{commit})" || continue |
6f6826c5 JS |
455 | fi |
456 | ||
457 | [ -f "../map/$sha1" ] || continue | |
458 | new_sha1="$(cat "../map/$sha1")" | |
3addc94a JS |
459 | GIT_COMMIT="$sha1" |
460 | export GIT_COMMIT | |
8c1ce0f4 JS |
461 | new_ref="$(echo "$ref" | eval "$filter_tag_name")" || |
462 | die "tag name filter failed: $filter_tag_name" | |
6f6826c5 JS |
463 | |
464 | echo "$ref -> $new_ref ($sha1 -> $new_sha1)" | |
465 | ||
466 | if [ "$type" = "tag" ]; then | |
a9da1663 JS |
467 | new_sha1=$( ( printf 'object %s\ntype commit\ntag %s\n' \ |
468 | "$new_sha1" "$new_ref" | |
469 | git cat-file tag "$ref" | | |
1bf6551e | 470 | sed -n \ |
9524cf29 | 471 | -e '1,/^$/{ |
a9da1663 JS |
472 | /^object /d |
473 | /^type /d | |
474 | /^tag /d | |
9524cf29 | 475 | }' \ |
1bf6551e | 476 | -e '/^-----BEGIN PGP SIGNATURE-----/q' \ |
a9da1663 | 477 | -e 'p' ) | |
1bf6551e BC |
478 | git mktag) || |
479 | die "Could not create new tag object for $ref" | |
480 | if git cat-file tag "$ref" | \ | |
e1622bfc | 481 | sane_grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1 |
1bf6551e BC |
482 | then |
483 | warn "gpg signature stripped from tag object $sha1t" | |
484 | fi | |
6f6826c5 JS |
485 | fi |
486 | ||
af580e9c JS |
487 | git update-ref "refs/tags/$new_ref" "$new_sha1" || |
488 | die "Could not write tag $new_ref" | |
6f6826c5 JS |
489 | done |
490 | fi | |
491 | ||
492 | cd ../.. | |
493 | rm -rf "$tempdir" | |
6f6826c5 | 494 | |
def16e71 BC |
495 | trap - 0 |
496 | ||
9273b562 EK |
497 | unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE |
498 | test -z "$ORIG_GIT_DIR" || { | |
499 | GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR | |
500 | } | |
501 | test -z "$ORIG_GIT_WORK_TREE" || { | |
502 | GIT_WORK_TREE="$ORIG_GIT_WORK_TREE" && | |
503 | export GIT_WORK_TREE | |
504 | } | |
505 | test -z "$ORIG_GIT_INDEX_FILE" || { | |
506 | GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" && | |
507 | export GIT_INDEX_FILE | |
508 | } | |
509 | ||
a4661b01 | 510 | if [ "$(is_bare_repository)" = false ]; then |
0ea29cce | 511 | git read-tree -u -m HEAD || exit |
a4661b01 | 512 | fi |
46eb449c | 513 | |
0ea29cce | 514 | exit 0 |