rebase: Add wrapper for git_rebase_inmemory_index() - #900
Merged
Conversation
While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this.
Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase.
lhchavez
approved these changes
Feb 24, 2022
github-actions Bot
pushed a commit
that referenced
this pull request
Feb 24, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b)
github-actions Bot
pushed a commit
that referenced
this pull request
Feb 24, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b)
github-actions Bot
pushed a commit
that referenced
this pull request
Feb 24, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b)
github-actions Bot
pushed a commit
that referenced
this pull request
Feb 24, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b)
github-actions Bot
pushed a commit
that referenced
this pull request
Feb 24, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b)
lhchavez
pushed a commit
that referenced
this pull request
Feb 25, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b) Co-authored-by: Patrick Steinhardt <ps@pks.im>
lhchavez
pushed a commit
that referenced
this pull request
Feb 25, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b) Co-authored-by: Patrick Steinhardt <ps@pks.im>
lhchavez
pushed a commit
that referenced
this pull request
Feb 25, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b) Co-authored-by: Patrick Steinhardt <ps@pks.im>
lhchavez
pushed a commit
that referenced
this pull request
Feb 25, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b) Co-authored-by: Patrick Steinhardt <ps@pks.im>
lhchavez
pushed a commit
that referenced
this pull request
Feb 25, 2022
* rebase: Fix missing initialization of the repo pointer While the `Rebase` structure has a pointer to the repository the rebase is creatde in, this pointer isn't ever initialized. Fix this. * rebase: Add wrapper for `git_rebase_inmemory_index()` Add a new wrapper for `git_rebase_inmemory_index()`, which can be used to retrieve the index for an in-memory rebase. Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com> (cherry picked from commit e7d1b2b) Co-authored-by: Patrick Steinhardt <ps@pks.im>
zhangshuyun
pushed a commit
to zhangshuyun/gitaly
that referenced
this pull request
Mar 9, 2022
Upgrade the Git2go dependency to v33.0.9. This upgrade most importantly contains the changes of [1], which allows us to access the index of in-memory rebases. This functionality is required to return the list of conflicts to callers. [1]: libgit2/git2go#900
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add a new wrapper for
git_rebase_inmemory_index(), which can be usedto retrieve the index for an in-memory rebase.