diff options
| author | David Turner <dturner@twosigma.com> | 2017-12-04 16:56:07 -0500 |
|---|---|---|
| committer | David Turner <dturner@twosigma.com> | 2017-12-04 17:15:00 -0500 |
| commit | 2a3e06359b8be1c5c53809a56e0fc3af62bdb024 (patch) | |
| tree | 150216ab9b616746994f2ecf5b04f6be71b261c0 /src | |
| parent | 429bb3575474a3d25ee1c9814612d8d01b3378e8 (diff) | |
| download | libgit2-2a3e06359b8be1c5c53809a56e0fc3af62bdb024.tar.gz | |
Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkout.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/checkout.c b/src/checkout.c index caed6cdf1..528fbdf92 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -2022,8 +2022,11 @@ static int checkout_write_entry( (error = checkout_safe_for_update_only(data, fullpath->ptr, side->mode)) <= 0) return error; - return checkout_write_content(data, - &side->id, fullpath->ptr, hint_path, side->mode, &st); + if (!S_ISGITLINK(side->mode)) + return checkout_write_content(data, + &side->id, fullpath->ptr, hint_path, side->mode, &st); + + return 0; } static int checkout_write_entries( |