diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-08-09 20:23:36 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-10-16 16:20:18 -0400 |
| commit | cfae7f85fbbc5b0e023e94f78486bf72cc1436f5 (patch) | |
| tree | a49385f788684e72f48a27b7b3ab834ab7266865 /src/checkout.c | |
| parent | 6f8cc7bb6a77e7b03751051be86a0c6b36bdd86f (diff) | |
| download | libgit2-cfae7f85fbbc5b0e023e94f78486bf72cc1436f5.tar.gz | |
Honor UPDATE_ONLY bit when checking out conflicts
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/checkout.c b/src/checkout.c index fa0609fe3..7c90ef81d 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -851,7 +851,7 @@ static void report_progress( data->opts.progress_payload); } -static int checkout_safe_for_update_only(const char *path, mode_t expected_mode) +int git_checkout__safe_for_update_only(const char *path, mode_t expected_mode) { struct stat st; @@ -921,7 +921,7 @@ static int checkout_blob( return -1; if ((data->strategy & GIT_CHECKOUT_UPDATE_ONLY) != 0) { - int rval = checkout_safe_for_update_only( + int rval = git_checkout__safe_for_update_only( git_buf_cstr(&data->path), file->mode); if (rval <= 0) return rval; |