[PATCH] Improved example "To move the whole tree into a subdirectory...".

Brett Randall· Jun 1, 2015, 13:04 UTC · lore

Previously this example would fail if the history contained any empty commit, because the index would not change, and the mv would fail with:

mv: cannot stat <redacted>/index.new': No such file or directory

The updated example checks whether the index file has been created before attempting the mv. The empty commit is retained.

See http://stackoverflow.com/questions/7798142/error-combining-git-repositories-into-subdirs for an example and explanation.

Signed-off-by: Brett Randall <javabrett@gmail.com>
---
 Documentation/git-filter-branch.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Documentation/git-filter-branch.txt +1 −1

diff --git a/Documentation/git-filter-branch.txt
b/Documentation/git-filter-branch.txt
index 73fd9e8..0b9e690 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -385,7 +385,7 @@ 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"' HEAD
+        if [ -f "$GIT_INDEX_FILE.new" ]; then mv
"$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"; fi' HEAD
 ---------------------------------------------------------------

-- 
2.3.5

patchImproved example "To move the whole tree into a subdirectory...".