Merge branch 'dl/complete-cherry-pick-revert-skip'

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 64f21547c1ab99ef3ad98d57fe0fbadff9621838..fea79646172184c630508908dd6eb61d3470074d 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -11,6 +11,8 @@
 # The following functions will also be available in the commit filter:
 
 functions=$(cat << \EOF
+EMPTY_TREE=$(git hash-object -t tree /dev/null)
+
 warn () {
        echo "$*" >&2
 }
@@ -46,7 +48,7 @@ git_commit_non_empty_tree()
 {
        if test $# = 3 && test "$1" = $(git rev-parse "$3^{tree}"); then
                map "$3"
-       elif test $# = 1 && test "$1" = 4b825dc642cb6eb9a060e54bf8d69288fbee4904; then
+       elif test $# = 1 && test "$1" = $EMPTY_TREE; then
                :
        else
                git commit-tree "$@"
@@ -81,6 +83,20 @@ set_ident () {
        finish_ident COMMITTER
 }
 
+if test -z "$FILTER_BRANCH_SQUELCH_WARNING$GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS"
+then
+       cat <<EOF
+WARNING: git-filter-branch has a glut of gotchas generating mangled history
+        rewrites.  Hit Ctrl-C before proceeding to abort, then use an
+        alternative filtering tool such as 'git filter-repo'
+        (https://github.com/newren/git-filter-repo/) instead.  See the
+        filter-branch manual page for more details; to squelch this warning,
+        set FILTER_BRANCH_SQUELCH_WARNING=1.
+EOF
+       sleep 10
+       printf "Proceeding with filter-branch...\n\n"
+fi
+
 USAGE="[--setup <command>] [--subdirectory-filter <directory>] [--env-filter <command>]
        [--tree-filter <command>] [--index-filter <command>]
        [--parent-filter <command>] [--msg-filter <command>]
@@ -370,6 +386,7 @@ while read commit parents; do
        git_filter_branch__commit_count=$(($git_filter_branch__commit_count+1))
 
        report_progress
+       test -f "$workdir"/../map/$commit && continue
 
        case "$filter_subdir" in
        "")