summaryrefslogtreecommitdiff
path: root/git-filter-branch.sh
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-06-08 21:28:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-09 19:24:16 (GMT)
commitcfabd6eee1745cfec58cfcb794ce8847e43b888a (patch)
tree0bac5625b6d7f25e3411c3b98b0c60f069d24582 /git-filter-branch.sh
parent813b4734fcb82e541658b33b8563387c197d6247 (diff)
downloadgit-cfabd6eee1745cfec58cfcb794ce8847e43b888a.zip
git-cfabd6eee1745cfec58cfcb794ce8847e43b888a.tar.gz
git-cfabd6eee1745cfec58cfcb794ce8847e43b888a.tar.bz2
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 <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-filter-branch.sh')
-rwxr-xr-xgit-filter-branch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index cb43b59..bfd118c 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 " ")