diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2017-12-23 10:07:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-23 10:07:44 +0000 |
| commit | 06f3aa5f6be216b8074ca7958067a41c8d538937 (patch) | |
| tree | d01f4281b4ffbc88ebf8b2c8758c71f9025e1a8e /src | |
| parent | a08672425d75a9a237d6282a53023faae091839b (diff) | |
| parent | 2a3e06359b8be1c5c53809a56e0fc3af62bdb024 (diff) | |
| download | libgit2-06f3aa5f6be216b8074ca7958067a41c8d538937.tar.gz | |
Merge pull request #4429 from novalis/delete-modify-submodule-merge
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( |