proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-11 08:35:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge: don't do rename detection on submodules

Browse Source
This commit is contained in:
Edward Thomson 2017-02-09 16:57:22 +00:00
parent 49806e9bc4
commit 95367366b2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/merge.c
View File

@ -1075,7 +1075,7 @@ static int index_entry_similarity_inexact(
int score = 0;
int error = 0;
if (GIT_MODE_TYPE(a->mode) != GIT_MODE_TYPE(b->mode))
if (!GIT_MODE_ISBLOB(a->mode) || !GIT_MODE_ISBLOB(b->mode))
return 0;
/* update signature cache if needed */