diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-06-08 23:28:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-09 12:24:16 -0700 |
| commit | cfabd6eee1745cfec58cfcb794ce8847e43b888a (patch) | |
| tree | 0bac5625b6d7f25e3411c3b98b0c60f069d24582 | |
| parent | 813b4734fcb82e541658b33b8563387c197d6247 (diff) | |
| download | git-cfabd6eee1745cfec58cfcb794ce8847e43b888a.tar.gz git-cfabd6eee1745cfec58cfcb794ce8847e43b888a.tar.xz | |
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>
| -rwxr-xr-x | git-filter-branch.sh | 2 | ||||
| -rwxr-xr-x | t/t7003-filter-branch.sh | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index cb43b5974..bfd118cd3 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 " ") diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 292b83766..0fabe4904 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -78,4 +78,25 @@ test_expect_success 'subdirectory filter result looks okay' ' ! git show sub:subdir ' +test_expect_success 'setup and filter history that requires --full-history' ' + git checkout master && + mkdir subdir && + echo A > subdir/new && + git add subdir/new && + test_tick && + git commit -m "subdir on master" subdir/new && + git rm a && + test_tick && + git commit -m "again subdir on master" && + git merge branch && + git-filter-branch --subdirectory-filter subdir sub-master +' + +test_expect_success 'subdirectory filter result looks okay' ' + test 3 = $(git-rev-list -1 --parents sub-master | wc -w) && + git show sub-master^:new && + git show sub-master^2:new && + ! git show sub:subdir +' + test_done |