Skip to content

filter-branch --subdirectory-filter improvements

Thomas Rast git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3filter-branch: Extend test to show rewriting bugt/t7003-filter-branch.sh+7 -30 replies
2/3filter-branch: fix ref rewriting with --subdirectory-filtergit-filter-branch.sh t/t7003-filter-branch.sh+12 -170 replies
3/3filter-branch: use --simplify-mergesgit-filter-branch.sh+4 -30 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/3] filter-branch --subdirectory-filter improvements
Quoted 2 lines · Junio C Hamano

Anything parked in 'pu' is a fair game for replacement later, so please send a replacement series and tell me to drop the previous ones from 'pu'.

So let's try this one. The first two do not depend on --simplify-merges.

1/3 is new, and extends the --subdirectory-filter test to prove the existence of the bug in current filter-branch. I hope it helps explain the issue.

2/3 is the same as before[*] modulo changing the test to expect success again.

The third one does depend on --simplify-merges.

3/3 introduces --simplify-merges, which improves the history that results from --subdirectory-filter. It has absolutely nothing to do with 2/3, except that it touches the same area of code. (You could s/rev-list/rev-list --simplify-merges/ in master:git-filter-branch.sh, and get the improved history without the bugfix.)

Sorry that I dispersed the patches and v2s randomly across the thread.

- Thomas

[*] http://kerneltrap.org/mailarchive/git/2008/8/8/2867244
"[PATCH v2] filter-branch: fix ref rewriting with --subdirectory-filter"

Thomas Rast (3):
filter-branch: Extend test to show rewriting bug
filter-branch: fix ref rewriting with --subdirectory-filter
filter-branch: use --simplify-merges