Thanks to visit codestin.com
Credit goes to github.com

Skip to content

rebase: orig_head and onto accessors #5057

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

Merged
merged 1 commit into from
May 12, 2019
Merged

rebase: orig_head and onto accessors #5057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions include/git2/rebase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,34 @@ GIT_EXTERN(int) git_rebase_open(
git_repository *repo,
const git_rebase_options *opts);

/**
* Gets the original `HEAD` ref name for merge rebases.
*
* @return The original `HEAD` ref name
*/
GIT_EXTERN(const char *) git_rebase_orig_head_name(git_rebase *rebase);

/**
* Gets the original `HEAD` id for merge rebases.
*
* @return The original `HEAD` id
*/
GIT_EXTERN(const git_oid *) git_rebase_orig_head_id(git_rebase *rebase);

/**
* Gets the `onto` ref name for merge rebases.
*
* @return The `onto` ref name
*/
GIT_EXTERN(const char *) git_rebase_onto_name(git_rebase *rebase);

/**
* Gets the `onto` id for merge rebases.
*
* @return The `onto` id
*/
GIT_EXTERN(const git_oid *) git_rebase_onto_id(git_rebase *rebase);

/**
* Gets the count of rebase operations that are to be applied.
*
Expand Down
16 changes: 16 additions & 0 deletions src/rebase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,6 +1327,22 @@ int git_rebase_finish(
return error;
}

const char *git_rebase_orig_head_name(git_rebase *rebase) {
return rebase->orig_head_name;
}

const git_oid *git_rebase_orig_head_id(git_rebase *rebase) {
return &rebase->orig_head_id;
}

const char *git_rebase_onto_name(git_rebase *rebase) {
return rebase->onto_name;
}

const git_oid *git_rebase_onto_id(git_rebase *rebase) {
return &rebase->onto_id;
}

size_t git_rebase_operation_entrycount(git_rebase *rebase)
{
assert(rebase);
Expand Down
10 changes: 10 additions & 0 deletions tests/rebase/merge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ void test_rebase_merge__next(void)
git_status_list *status_list;
const git_status_entry *status_entry;
git_oid pick_id, file1_id;
git_oid master_id, beef_id;

git_oid_fromstr(&master_id, "efad0b11c47cb2f0220cbd6f5b0f93bb99064b00");
git_oid_fromstr(&beef_id, "b146bd7608eac53d9bf9e1a6963543588b555c64");

cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef"));
cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master"));
Expand All @@ -53,6 +57,12 @@ void test_rebase_merge__next(void)

cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL));

cl_assert_equal_s("refs/heads/beef", git_rebase_orig_head_name(rebase));
cl_assert_equal_oid(&beef_id, git_rebase_orig_head_id(rebase));

cl_assert_equal_s("master", git_rebase_onto_name(rebase));
cl_assert_equal_oid(&master_id, git_rebase_onto_id(rebase));

cl_git_pass(git_rebase_next(&rebase_operation, rebase));

git_oid_fromstr(&pick_id, "da9c51a23d02d931a486f45ad18cda05cf5d2b94");
Expand Down