Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

File renaming caused colliding pathnames #53

Closed
kinke opened this issue Feb 10, 2020 · 2 comments
Closed

File renaming caused colliding pathnames #53

kinke opened this issue Feb 10, 2020 · 2 comments

Comments

@kinke
Copy link

kinke commented Feb 10, 2020

Hi,

I tried this with git-filter-repo v2.25:

$ git clone https://github.com/dlang/dmd.git
$ cd dmd
$ git-filter-repo --subdirectory-filter test
Parsed 22266 commitsFile renaming caused colliding pathnames!
  Commit: b'4473071207c78d691f7ed2ec4713172663f3bea8'
  Filename: b'README.md'
fatal: stream ends early
fast-import: dumping crash report to .git/fast_import_crash_1734

I've then tried to work around it; removing the trailing slash passes a --dry-run (no errors during commits parsing), but then yields

$ git-filter-repo --path test/ --path-rename test/:
same as above
$ git-filter-repo --path test --path-rename test:
Parsed 333 commitsfatal: Empty path component found in input
fast-import: dumping crash report to .git/fast_import_crash_2000
Traceback (most recent call last):
...
BrokenPipeError: [Errno 32] Broken pipe

A similar git filter-branch cmdline I'm trying to replace works:

git filter-branch --tag-name-filter cat --prune-empty --subdirectory-filter test -- --all
@newren
Copy link
Owner

newren commented Feb 10, 2020

Well, that was a pretty embarrassing bug. Thanks for the nice clear report and testcase; you made it very easy to track down. Fixed with the commit I just pushed.

@kinke
Copy link
Author

kinke commented Feb 10, 2020

Thanks for the super-quick fix!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants