diff options
| author | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
| commit | fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc (patch) | |
| tree | 1446cb018eb05571b4eff101ceae937688e83a1d /src/checkout.c | |
| parent | de8fe729efd350ae5cb1ef25ffb08f92c6f706b9 (diff) | |
| parent | ab1368766240cfe861729642abe1cddd01c0203e (diff) | |
| download | libgit2-fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc.tar.gz | |
Merge branch 'development' into blame
Conflicts:
include/git2.h
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/checkout.c b/src/checkout.c index 0e9d11bff..5d741d393 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -1119,7 +1119,7 @@ static void checkout_data_clear(checkout_data *data) static int checkout_data_init( checkout_data *data, git_iterator *target, - git_checkout_opts *proposed) + const git_checkout_opts *proposed) { int error = 0; git_repository *repo = git_iterator_owner(target); @@ -1229,7 +1229,7 @@ cleanup: int git_checkout_iterator( git_iterator *target, - git_checkout_opts *opts) + const git_checkout_opts *opts) { int error = 0; git_iterator *baseline = NULL, *workdir = NULL; @@ -1404,7 +1404,7 @@ int git_checkout_tree( int git_checkout_head( git_repository *repo, - git_checkout_opts *opts) + const git_checkout_opts *opts) { int error; git_tree *head = NULL; |