Re: [PATCH] Fix filter-branch to eliminate duplicate mapped parents

2014-07-01 Thread Junio C Hamano
Charles Bailey writes: > I worked on this after discovering that --prune-empty often left some > apparently empty commits that I was wasn't expecting it to leave and > that running filter-branch --prune-empty in a loop would often do many > passes where it was still pruning empty former merge com

Re: [PATCH] Fix filter-branch to eliminate duplicate mapped parents

2014-07-01 Thread Charles Bailey
On Mon, Jun 30, 2014 at 10:20:27PM +0100, Charles Bailey wrote: > From: Charles Bailey > > This change ensure that duplicate parents are pruned before the parent > filter and ensures that --prune-empty is idempotent, removing all > empty non-merge commits in a singe pass. s/change ensure/change

[PATCH] Fix filter-branch to eliminate duplicate mapped parents

2014-06-30 Thread Charles Bailey
From: Charles Bailey When multiple parents of a merge commit get mapped to the same commit, filter-branch used to pass all instances of the parent commit to the parent and commit filters and to "git commit-tree" or "git_commit_non_empty_tree". This can often happen when extracting a small projec