Skip to content

More diff functionality #629

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

Merged
merged 24 commits into from
Aug 18, 2020
Merged

More diff functionality #629

merged 24 commits into from
Aug 18, 2020

Conversation

mbfr
Copy link
Contributor

@mbfr mbfr commented Aug 14, 2020

This PR adds

  • The ability to apply a Diff object to the repo
  • Support for git_apply_hunk_cb and git_apply_delta_cb callbacks in options for applying the diffs
  • The ability to import a diff from a raw buffer (for example, one exported by ToBuf) into a Diff object associated with the repo
  • Tests for the above

The test files might be a bit messy but there's quite a lot of stuff to cover.

Copy link
Contributor

@lhchavez lhchavez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice test coverage!

lhchavez and others added 10 commits August 16, 2020 06:53
This change adds:

* `tag.yml`: Creates a new tag every time the master or a release branch
  is pushed.
* `backport.yml`: Creates a cherry-pick in older release branches to
  keep them up to date with little cost.
Fix spaces->tabs

Co-authored-by: lhchavez <lhchavez@lhchavez.com>
Make test naming consistent

Co-authored-by: lhchavez <lhchavez@lhchavez.com>
Copy link
Contributor

@lhchavez lhchavez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for this patch!

Pro tip: run tests before pushing.
@lhchavez lhchavez merged commit 7883ec8 into libgit2:master Aug 18, 2020
github-actions bot pushed a commit that referenced this pull request Aug 18, 2020
This PR adds

- The ability to apply a Diff object to the repo
- Support for git_apply_hunk_cb and git_apply_delta_cb callbacks in options for applying the diffs
- The ability to import a diff from a raw buffer (for example, one exported by ToBuf) into a Diff object associated with the repo
- Tests for the above

(cherry picked from commit 7883ec8)
github-actions bot pushed a commit that referenced this pull request Aug 18, 2020
This PR adds

- The ability to apply a Diff object to the repo
- Support for git_apply_hunk_cb and git_apply_delta_cb callbacks in options for applying the diffs
- The ability to import a diff from a raw buffer (for example, one exported by ToBuf) into a Diff object associated with the repo
- Tests for the above

(cherry picked from commit 7883ec8)
lhchavez pushed a commit that referenced this pull request Aug 18, 2020
This PR adds

- The ability to apply a Diff object to the repo
- Support for git_apply_hunk_cb and git_apply_delta_cb callbacks in options for applying the diffs
- The ability to import a diff from a raw buffer (for example, one exported by ToBuf) into a Diff object associated with the repo
- Tests for the above

(cherry picked from commit 7883ec8)
lhchavez pushed a commit that referenced this pull request Aug 18, 2020
This PR adds

- The ability to apply a Diff object to the repo
- Support for git_apply_hunk_cb and git_apply_delta_cb callbacks in options for applying the diffs
- The ability to import a diff from a raw buffer (for example, one exported by ToBuf) into a Diff object associated with the repo
- Tests for the above

(cherry picked from commit 7883ec8)
lhchavez added a commit to lhchavez/git2go that referenced this pull request Aug 18, 2020
This reverts commit 4d69027.

v0.27 does not support this API.
lhchavez added a commit that referenced this pull request Aug 18, 2020
This reverts commit 4d69027.

v0.27 does not support this API.
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