When converting an svn repository to git, I am filtering the commits using --msg-filter. During this conversion I want to use the .git-rewrite/map data to fill in references to other commits. In the svn repo, there is a commit message e.g. "Cherry-pick r207", and I want to append "r207 = <commit>" to the git commit message, as r207 no longer means very much. This works fine when the git commit corresponding to r207 has been filtered before the current commit, and is present in the map. When filtering in --topo-order, this is not always the case, making it impossible to look up the git commit. Signed-off-by: Peter Rosin <peda@xxxxxxxxxxxxxx> --- git-filter-branch.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 9a09ba1..dbb2bb3 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -257,11 +257,11 @@ mkdir ../map || die "Could not create map/ directory" case "$filter_subdir" in "") - git rev-list --reverse --topo-order --default HEAD \ + git rev-list --reverse --date-order --default HEAD \ --parents --simplify-merges "$@" ;; *) - git rev-list --reverse --topo-order --default HEAD \ + git rev-list --reverse --date-order --default HEAD \ --parents --simplify-merges "$@" -- "$filter_subdir" esac > ../revs || die "Could not get the commits" commits=$(wc -l <../revs | tr -d " ") -- 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
