From: Brett Randall Date: Tue, 21 Jun 2016 05:57:02 GMT Subject: [PATCH] Improved example "To move the whole tree into a subdirectory..." to not fail when early commits are empty. Message-ID: <20160621055702.28044-1-javabrett@gmail.com> Previously this example would fail if the oldest commit(s) in any filtered branch is/are empty (no files) because the index would not change, and the mv would fail with: mv: cannot stat /index.new': No such file or directory This commonly occurs with histories created from git-svn-clone. 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 --- Documentation/git-filter-branch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 003731f..271d5b0 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.8.4