search

mystor / phlay

Phlay your commits onto Phabricator
19 stars 17 forks source link

Unable to land a patch that fixes DOS line endings #27

Closed amccreight closed 6 years ago

amccreight commented 6 years ago

I get a rebase error: https://lando.services.mozilla.com/revisions/D4156/13502/

This sounds like it could be related to issue #21.

mystor commented 6 years ago

Hmm, yes. It's likely that python is being clever and "helpfully" making the diff uniformly handle newlines.

@amccreight Could you send me the output of git diff -U 65535 --patch --no-textconv --no-ext-diff --no-color commit..range for that patch?

amccreight commented 6 years ago

I guess I don't understand what you mean, because I tried git diff -U 65535 --patch --no-textconv --no-ext-diff --no-color mozilla/central..4cfbe8097d52 and I got the error "error: short SHA1 65535 is ambiguous", so something isn't right.

amccreight commented 6 years ago

Ah, no space after the U, it looks like.

mystor commented 6 years ago

Fixed by #31