[Kde-games-devel] kolf, kolf2, kolf-ng

[Nicolás Alvarez]

Wolfgang Rohdewald wrote:
> I was wrong - I am not even able to correctly remove that
> swap file
> 
> git filter-branch --tree-filter 'rm -f sounds/.Makefile.am.swp' HEAD
> 
> even that leads to strange duplicate branches. I copied
> kolf.org (the repo after svn2git without any postprocessing)
> and kolf (kolf.org after applying the filter-branch as above)
> to dewey.kde.org/wrohdewald so maybe somebody can have a
> closer look. gitk --all will show many svn revisions twice, like
> r606075 "fix linking under windows".

git filter-branch overwrites all the refs for branches (and tags, if you 
used --tag-name-filter) to point at the newly filtered commits, and creates 
backup refs under original/ with the old contents of the original refs. You 
can use the script in kde-ruleset/bin/remove-fb-backup-refs.sh to delete 
filter-branch's backup refs.

Alternatively, while you're simply testing things, you can use
"gitk --branches" to only see refs from refs/heads/* (ie. normal branches), 
and not the refs/original/* refs that git filter-branch created.

-- 
Nicolas