Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 4ddd656e847e90e8f9f373e40dc41c39809d816f..6e14bf1c7f0991bbaab217e8a08bae0cacfe1ab1 100755 (executable)
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -30,24 +30,26 @@ test_expect_success 'setup' '
 H=$(git rev-parse H)
 
 test_expect_success 'rewrite identically' '
-       git-filter-branch H2
+       git-filter-branch branch
 '
-
 test_expect_success 'result is really identical' '
-       test $H = $(git rev-parse H2)
+       test $H = $(git rev-parse HEAD)
 '
 
 test_expect_success 'rewrite, renaming a specific file' '
-       git-filter-branch --tree-filter "mv d doh || :" H3
+       git-filter-branch -f --tree-filter "mv d doh || :" HEAD
 '
 
 test_expect_success 'test that the file was renamed' '
-       test d = $(git show H3:doh)
+       test d = $(git show HEAD:doh) &&
+       test -f doh &&
+       test d = $(cat doh)
 '
 
-git tag oldD H3~4
+git tag oldD HEAD~4
 test_expect_success 'rewrite one branch, keeping a side branch' '
-       git-filter-branch --tree-filter "mv b boh || :" modD D..oldD
+       git branch modD oldD &&
+       git-filter-branch -f --tree-filter "mv b boh || :" D..modD
 '
 
 test_expect_success 'common ancestor is still common (unchanged)' '
@@ -69,7 +71,8 @@ test_expect_success 'filter subdirectory only' '
        git rm a &&
        test_tick &&
        git commit -m "again not subdir" &&
-       git-filter-branch --subdirectory-filter subdir sub
+       git branch sub &&
+       git-filter-branch -f --subdirectory-filter subdir refs/heads/sub
 '
 
 test_expect_success 'subdirectory filter result looks okay' '
@@ -89,7 +92,8 @@ test_expect_success 'setup and filter history that requires --full-history' '
        test_tick &&
        git commit -m "again subdir on master" &&
        git merge branch &&
-       git-filter-branch --subdirectory-filter subdir sub-master
+       git branch sub-master &&
+       git-filter-branch -f --subdirectory-filter subdir sub-master
 '
 
 test_expect_success 'subdirectory filter result looks okay' '
@@ -100,7 +104,8 @@ test_expect_success 'subdirectory filter result looks okay' '
 '
 
 test_expect_success 'use index-filter to move into a subdirectory' '
-       git-filter-branch --index-filter \
+       git branch directorymoved &&
+       git-filter-branch -f --index-filter \
                 "git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
                  GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
                        git update-index --index-info &&
@@ -108,9 +113,10 @@ test_expect_success 'use index-filter to move into a subdirectory' '
        test -z "$(git diff HEAD directorymoved:newsubdir)"'
 
 test_expect_success 'stops when msg filter fails' '
-       ! git-filter-branch --msg-filter false nonono &&
-       rm -rf .git-rewrite &&
-       ! git rev-parse nonono
+       old=$(git rev-parse HEAD) &&
+       ! git-filter-branch -f --msg-filter false HEAD &&
+       test $old = $(git rev-parse HEAD) &&
+       rm -rf .git-rewrite
 '
 
 test_expect_success 'author information is preserved' '
@@ -118,7 +124,8 @@ test_expect_success 'author information is preserved' '
        git add i &&
        test_tick &&
        GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
-       git-filter-branch --msg-filter "cat; \
+       git branch preserved-author &&
+       git-filter-branch -f --msg-filter "cat; \
                        test \$GIT_COMMIT != $(git rev-parse master) || \
                        echo Hallo" \
                preserved-author &&
@@ -129,16 +136,11 @@ test_expect_success "remove a certain author's commits" '
        echo i > i &&
        test_tick &&
        git commit -m i i &&
-       git-filter-branch --commit-filter "\
+       git branch removed-author &&
+       git-filter-branch -f --commit-filter "\
                if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
                then\
-                       shift;\
-                       while [ -n \"\$1\" ];\
-                       do\
-                               shift;\
-                               echo \"\$1\";\
-                               shift;\
-                       done;\
+                       skip_commit \"\$@\";
                else\
                        git commit-tree \"\$@\";\
                fi" removed-author &&
@@ -148,4 +150,57 @@ test_expect_success "remove a certain author's commits" '
        test 0 = $(git rev-list --author="B V Uips" removed-author | wc -l)
 '
 
+test_expect_success 'barf on invalid name' '
+       ! git filter-branch -f master xy-problem &&
+       ! git filter-branch -f HEAD^
+'
+
+test_expect_success '"map" works in commit filter' '
+       git filter-branch -f --commit-filter "\
+               parent=\$(git rev-parse \$GIT_COMMIT^) &&
+               mapped=\$(map \$parent) &&
+               actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
+               test \$mapped = \$actual &&
+               git commit-tree \"\$@\";" master~2..master &&
+       git rev-parse --verify master
+'
+
+test_expect_success 'Name needing quotes' '
+
+       git checkout -b rerere A &&
+       mkdir foo &&
+       name="れれれ" &&
+       >foo/$name &&
+       git add foo &&
+       git commit -m "Adding a file" &&
+       git filter-branch --tree-filter "rm -fr foo" &&
+       ! git ls-files --error-unmatch "foo/$name" &&
+       test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
+
+'
+
+test_expect_success 'Subdirectory filter with disappearing trees' '
+       git reset --hard &&
+       git checkout master &&
+
+       mkdir foo &&
+       touch foo/bar &&
+       git add foo &&
+       test_tick &&
+       git commit -m "Adding foo" &&
+
+       git rm -r foo &&
+       test_tick &&
+       git commit -m "Removing foo" &&
+
+       mkdir foo &&
+       touch foo/bar &&
+       git add foo &&
+       test_tick &&
+       git commit -m "Re-adding foo" &&
+
+       git filter-branch -f --subdirectory-filter foo &&
+       test $(git rev-list master | wc -l) = 3
+'
+
 test_done