From cfabd6eee1745cfec58cfcb794ce8847e43b888a Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Fri, 8 Jun 2007 23:28:50 +0200 Subject: filter-branch: subdirectory filter needs --full-history When two branches are merged that modify a subdirectory (possibly in different intermediate steps) such that both end up identical, then rev-list chooses only one branch. But when we filter history, we want to keep both branches. Therefore, we must use --full-history. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- git-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-filter-branch.sh') diff --git a/git-filter-branch.sh b/git-filter-branch.sh index cb43b59740..bfd118cd3b 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -323,7 +323,7 @@ case "$filter_subdir" in ;; *) git-rev-list --reverse --topo-order --default HEAD \ - --parents "$@" -- "$filter_subdir" + --parents --full-history "$@" -- "$filter_subdir" esac > ../revs commits=$(cat ../revs | wc -l | tr -d " ") -- cgit v1.3