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

git: Remove --binary from diff args #67

Merged
merged 1 commit into from
Oct 10, 2022
Merged

Conversation

jerry-skydio
Copy link
Collaborator

We don't need a binary patch in order to apply
because we just use object ids for 3way.

Git patch-id is broken for all binary diffs, although
its slightly less broken if there is no patch -- it just
produces the same patch-id rather than breaking parsing
for the rest of the commit.

Topic: patchid
Reviewers: brian-k

We don't need a binary patch in order to apply
because we just use object ids for 3way.

Git patch-id is broken for all binary diffs, although
its slightly less broken if there is no patch -- it just
produces the same patch-id rather than breaking parsing
for the rest of the commit.

Topic: patchid
Reviewers: brian-k
@jerry-skydio
Copy link
Collaborator Author

Reviews in this chain:
#67 git: Remove --binary from diff args

@jerry-skydio
Copy link
Collaborator Author

# head base diff date summary
0 c1bdab1a aa41c582 diff Oct 10 11:21 AM 1 file changed, 1 deletion(-)

@jerry-skydio jerry-skydio merged commit 0e3694e into main Oct 10, 2022
@jerry-skydio jerry-skydio deleted the jerry/revup/main/patchid branch October 10, 2022 18:33
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

Successfully merging this pull request may close these issues.

2 participants