Skip to content

merge: Return non-const git_repository from accessor method #5358

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.

Sign up for GitHub

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

Jump to bottom
Merged
pks-t merged 1 commit into from
Jan 17, 2020
Merged

merge: Return non-const git_repository from accessor method #5358

pks-t merged 1 commit into from
Jan 17, 2020

Conversation

@lrm29
Copy link
Contributor

@lrm29 lrm29 commented Jan 15, 2020 •
edited
Loading

Because this accessor is const, I can't do something like this in the git merge driver without casting away const:

int CustomApply(git_merge_driver* self,
                const char** path_out,
                uint32_t* mode_out,
                git_buf* merged_out,
                const char* filter_name,
                const git_merge_driver_source* src) {
    const git_repository* repo = git_merge_driver_source_repo(src);

    git_config* cfg;

    // ERROR! repo is const!
    int errorCode = git_repository_config(&cfg, repo);

    git_config_free(cfg);

    return 0;
}

The definition of git_merge_driver_source has git_repository as non-const:

struct git_merge_driver_source {
	git_repository *repo;
	const char *default_driver;
	const git_merge_file_options *file_opts;

	const git_index_entry *ancestor;
	const git_index_entry *ours;
	const git_index_entry *theirs;
};

@ethomson
Copy link
Member

ethomson commented Jan 15, 2020

Indeed. This seems like the right thing to do. @pks-t any comments?

pks-t
pks-t approved these changes Jan 17, 2020
View reviewed changes
Copy link
Member

@pks-t pks-t left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks for this improvement!

@pks-t pks-t merged commit a76348e into libgit2:master Jan 17, 2020
@lrm29 lrm29 deleted the git_merge_driver_source_repo_non_const branch January 17, 2020 09:45
@implausible implausible mentioned this pull request Feb 26, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pks-t pks-t pks-t approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@lrm29 @ethomson @pks-t