3 # Rewrite revision history
4 # Copyright (c) Petr Baudis, 2006
5 # Minimal changes to "port" it to core-git (c) Johannes Schindelin, 2007
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,
11 # The following functions will also be available in the commit filter:
13 functions
=$
(cat << \EOF
20 # if it was not rewritten, take the original
21 if test -r "$workdir/../map/$1"
23 cat "$workdir/../map/$1"
29 # if you run 'skip_commit "$@"' in a commit filter, it will print
30 # the (mapped) parents, effectively skipping the commit.
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
()
47 if test $# = 3 && test "$1" = $
(git rev-parse
"$3^{tree}"); then
53 # override die(): this version puts in an extra line break, so that
54 # the progress is still visible
67 # When piped a commit, output a script to set the ident of either
68 # "author" or "committer
71 lid
="$(echo "$1" | tr "[A-Z
]" "[a-z
]")"
72 uid
="$(echo "$1" | tr "[a-z
]" "[A-Z
]")"
77 s/^'$lid' \([^<]*\) <[^>]*> .*$/\1/
79 s
/.
*/GIT_
'$uid'_NAME
='\''&'\''; export GIT_
'$uid'_NAME
/p
82 s
/^
'$lid' [^
<]* <\
([^
>]*\
)> .
*$
/\
1/
84 s/.*/GIT_'$uid'_EMAIL='\''&'\''; export GIT_'$uid'_EMAIL/p
87 s/^'$lid' [^<]* <[^>]*> \(.*\)$/@\1/
89 s
/.
*/GIT_
'$uid'_DATE
='\''&'\''; export GIT_
'$uid'_DATE
/p
95 LANG=C LC_ALL=C sed -ne "$pick_id_script"
96 # Ensure non-empty id name.
97 echo "case \"\$GIT_${uid}_NAME\" in \"\") GIT_${uid}_NAME=\"\${GIT_${uid}_EMAIL%%@*}\" && export GIT_${uid}_NAME;; esac"
100 USAGE="[--env-filter <command>] [--tree-filter <command>]
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>...]"
110 if [ "$(is_bare_repository)" = false ]; then
111 require_clean_work_tree 'rewrite branches
'
123 orig_namespace=refs/original/
140 # deprecated ($remap_to_ancestor is set now automatically)
156 # all switches take one argument
158 case "$#" in 1) usage ;; esac
171 filter_tree="$OPTARG"
174 filter_index="$OPTARG"
177 filter_parent="$OPTARG"
183 filter_commit="$functions; $OPTARG"
186 filter_tag_name="$OPTARG"
188 --subdirectory-filter)
189 filter_subdir="$OPTARG"
193 orig_namespace=$(expr "$OPTARG/" : '\
(.
*[^
/]\
)/*$
')/
201 case "$prune_empty,$filter_commit" in
203 filter_commit='git commit-tree
"$@"';;
205 filter_commit="$functions;"' git_commit_non_empty_tree
"$@"';;
209 die "Cannot set --prune-empty and --commit-filter at the same time"
217 test -d "$tempdir" &&
218 die "$tempdir already exists, please remove it"
221 mkdir -p "$tempdir/t" &&
222 tempdir="$(cd "$tempdir"; pwd)" &&
227 # Remove tempdir on exit
228 trap 'cd "$orig_dir"; rm -rf "$tempdir"' 0
230 ORIG_GIT_DIR="$GIT_DIR"
231 ORIG_GIT_WORK_TREE="$GIT_WORK_TREE"
232 ORIG_GIT_INDEX_FILE="$GIT_INDEX_FILE"
234 export GIT_DIR GIT_WORK_TREE
236 # Make sure refs/original is empty
237 git for-each-ref > "$tempdir"/backup-refs || exit
238 while read sha1 type name
240 case "$force,$name" in
242 die "Cannot create a new backup.
243 A previous backup already exists in $orig_namespace
244 Force overwriting the backup with -f"
247 git update-ref -d "$name" $sha1
250 done < "$tempdir"/backup-refs
252 # The refs should be updated if their heads were rewritten
253 git rev-parse --no-flags --revs-only --symbolic-full-name \
254 --default HEAD "$@" > "$tempdir"/raw-heads || exit
255 sed -e '/^^
/d
' "$tempdir"/raw-heads >"$tempdir"/heads
257 test -s "$tempdir"/heads ||
258 die "Which ref do you want to rewrite?"
260 GIT_INDEX_FILE="$(pwd)/../index"
261 export GIT_INDEX_FILE
263 # map old->new commit ids for rewriting parents
264 mkdir ../map || die "Could not create map/ directory"
266 # we need "--" only if there are no path arguments in $@
267 nonrevs=$(git rev-parse --no-revs "$@") || exit
268 if test -z "$nonrevs"
276 rev_args=$(git rev-parse --revs-only "$@")
278 case "$filter_subdir" in
280 eval set -- "$(git rev-parse --sq --no-revs "$@")"
283 eval set -- "$(git rev-parse --sq --no-revs "$@" $dashdash \
288 git rev-list --reverse --topo-order --default HEAD \
289 --parents --simplify-merges $rev_args "$@" > ../revs ||
290 die "Could not get the commits"
291 commits=$(wc -l <../revs | tr -d " ")
293 test $commits -eq 0 && die "Found nothing to rewrite"
295 # Rewrite the commits
297 git_filter_branch__commit_count=0
298 while read commit parents; do
299 git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1))
300 printf "\rRewrite $commit ($git_filter_branch__commit_count/$commits)"
302 case "$filter_subdir" in
304 git read-tree -i -m $commit
307 # The commit may not have the subdirectory at all
308 err=$(git read-tree -i -m $commit:"$filter_subdir" 2>&1) || {
309 if ! git rev-parse -q --verify $commit:"$filter_subdir"
311 rm -f "$GIT_INDEX_FILE"
317 esac || die "Could not initialize the index"
321 git cat-file commit "$commit" >../commit ||
322 die "Cannot read commit $commit"
324 eval "$(set_ident AUTHOR <../commit)" ||
325 die "setting author failed for commit $commit"
326 eval "$(set_ident COMMITTER <../commit)" ||
327 die "setting committer failed for commit $commit"
328 eval "$filter_env" < /dev/null ||
329 die "env filter failed: $filter_env"
331 if [ "$filter_tree" ]; then
332 git checkout-index -f -u -a ||
333 die "Could not checkout the index"
334 # files that $commit removed are now still in the working tree;
335 # remove them, else they would be added again
336 git clean -d -q -f -x
337 eval "$filter_tree" < /dev/null ||
338 die "tree filter failed: $filter_tree"
341 git diff-index -r --name-only --ignore-submodules $commit &&
342 git ls-files --others
343 ) > "$tempdir"/tree-state || exit
344 git update-index --add --replace --remove --stdin \
345 < "$tempdir"/tree-state || exit
348 eval "$filter_index" < /dev/null ||
349 die "index filter failed: $filter_index"
352 for parent in $parents; do
353 for reparent in $(map "$parent"); do
354 parentstr="$parentstr -p $reparent"
357 if [ "$filter_parent" ]; then
358 parentstr="$(echo "$parentstr" | eval "$filter_parent")" ||
359 die "parent filter failed: $filter_parent"
362 sed -e '1,/^$
/d
' <../commit | \
363 eval "$filter_msg" > ../message ||
364 die "msg filter failed: $filter_msg"
365 workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
366 $(git write-tree) $parentstr < ../message > ../map/$commit ||
367 die "could not write rewritten commit"
370 # If we are filtering for paths, as in the case of a subdirectory
371 # filter, it is possible that a specified head is not in the set of
372 # rewritten commits, because it was pruned by the revision walker.
373 # Ancestor remapping fixes this by mapping these heads to the unique
374 # nearest ancestor that survived the pruning.
376 if test "$remap_to_ancestor" = t
380 sha1=$(git rev-parse "$ref"^0)
381 test -f "$workdir"/../map/$sha1 && continue
382 ancestor=$(git rev-list --simplify-merges -1 "$ref" "$@")
383 test "$ancestor" && echo $(map $ancestor) >> "$workdir"/../map/$sha1
384 done < "$tempdir"/heads
387 # Finally update the refs
389 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
390 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
394 # avoid rewriting a ref twice
395 test -f "$orig_namespace$ref" && continue
397 sha1=$(git rev-parse "$ref"^0)
398 rewritten=$(map $sha1)
400 test $sha1 = "$rewritten" &&
401 warn "WARNING: Ref '$ref' is unchanged" &&
406 echo "Ref '$ref' was deleted"
407 git update-ref -m "filter-branch: delete" -d "$ref" $sha1 ||
408 die "Could not delete $ref"
411 echo "Ref '$ref' was rewritten"
412 if ! git update-ref -m "filter-branch: rewrite" \
413 "$ref" $rewritten $sha1 2>/dev/null; then
414 if test $(git cat-file -t "$ref") = tag; then
415 if test -z "$filter_tag_name"; then
416 warn "WARNING: You said to rewrite tagged commits, but not the corresponding tag."
417 warn "WARNING: Perhaps use '--tag-name-filter cat' to rewrite the tag."
420 die "Could not rewrite $ref"
425 # NEEDSWORK: possibly add -Werror, making this an error
426 warn "WARNING: '$ref' was rewritten into multiple commits:"
428 warn "WARNING: Ref '$ref' points to the first one now."
429 rewritten=$(echo "$rewritten" | head -n 1)
430 git update-ref -m "filter-branch: rewrite to first" \
431 "$ref" $rewritten $sha1 ||
432 die "Could not rewrite $ref"
435 git update-ref -m "filter-branch: backup" "$orig_namespace$ref" $sha1 ||
437 done < "$tempdir"/heads
439 # TODO: This should possibly go, with the semantics that all positive given
440 # refs are updated, and their original heads stored in refs/original/
443 if [ "$filter_tag_name" ]; then
444 git for-each-ref --format='%(objectname
) %(objecttype
) %(refname
)' refs/tags |
445 while read sha1 type ref; do
446 ref="${ref#refs/tags/}"
447 # XXX: Rewrite tagged trees as well?
448 if [ "$type" != "commit" -a "$type" != "tag" ]; then
452 if [ "$type" = "tag" ]; then
453 # Dereference to a commit
455 sha1="$(git rev-parse -q "$sha1"^{commit})" || continue
458 [ -f "../map/$sha1" ] || continue
459 new_sha1="$(cat "../map/$sha1")"
462 new_ref="$(echo "$ref" | eval "$filter_tag_name")" ||
463 die "tag name filter failed: $filter_tag_name"
465 echo "$ref -> $new_ref ($sha1 -> $new_sha1)"
467 if [ "$type" = "tag" ]; then
468 new_sha1=$( ( printf 'object
%s
\ntype commit
\ntag
%s
\n' \
469 "$new_sha1" "$new_ref"
470 git cat-file tag "$ref" |
477 -e '/^
-----BEGIN PGP SIGNATURE----
-/q
' \
480 die "Could not create new tag object for $ref"
481 if git cat-file tag "$ref" | \
482 sane_grep '^
-----BEGIN PGP SIGNATURE-----
' >/dev/null 2>&1
484 warn "gpg signature stripped from tag object $sha1t"
488 git update-ref "refs/tags/$new_ref" "$new_sha1" ||
489 die "Could not write tag $new_ref"
498 unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE
499 test -z "$ORIG_GIT_DIR" || {
500 GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR
502 test -z "$ORIG_GIT_WORK_TREE" || {
503 GIT_WORK_TREE="$ORIG_GIT_WORK_TREE" &&
506 test -z "$ORIG_GIT_INDEX_FILE" || {
507 GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" &&
508 export GIT_INDEX_FILE
511 if [ "$(is_bare_repository)" = false ]; then
512 git read-tree -u -m HEAD || exit