filter-branch: add example to move everything into a subdirectory

This is based on Jeff King's example in

20070621130137.GB4487@coredump.intra.peff.net

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
old mode 100755 (executable)
new mode 100644 (file)
index bfd118c..8fa5ce6
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -178,6 +178,14 @@
 #
 #      git-filter-branch ... new-H C..H --not D
 #      git-filter-branch ... new-H D..H --not C
 #
 #      git-filter-branch ... new-H C..H --not D
 #      git-filter-branch ... new-H D..H --not C

+#
+# To move the whole tree into a subdirectory, or remove it from there:
+#
+# git-filter-branch --index-filter \
+#      'git-ls-files -s | sed "s-\t-&newsubdir/-" |
+#              GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
+#                      git-update-index --index-info &&
+#       mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' directorymoved

 
 # Testsuite: TODO
 
 
 # Testsuite: TODO
 

diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 0fabe4904f7bfb942ba24287862d054e9a4d174c..f00c262e450f9ba23b8e065bce2e4780185821af 100755 (executable)
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -99,4 +99,12 @@ test_expect_success 'subdirectory filter result looks okay' '
        ! git show sub:subdir
 '
 
        ! git show sub:subdir
 '
 

+test_expect_success 'use index-filter to move into a subdirectory' '
+       git-filter-branch --index-filter \
+                "git-ls-files -s | sed \"s-\\t-&newsubdir/-\" |
+                 GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
+                       git-update-index --index-info &&
+                 mv \$GIT_INDEX_FILE.new \$GIT_INDEX_FILE" directorymoved &&
+       test -z "$(git diff HEAD directorymoved:newsubdir)"'
+

 test_done
 test_done