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

index: correctly report which conflict stage has a wrong filemode

Browse Source 
When we're at offset 'i', we're dealing with the 'i+1' stage, since
conflicts start at 1.
This commit is contained in:
Carlos Martín Nieto 2015-11-11 00:36:15 +01:00
parent 1314af8d63
commit 16604d7469
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/index.c
View File

@ -1691,7 +1691,7 @@ int git_index_conflict_add(git_index *index,
for (i = 0; i < 3; i++) {
if (entries[i] && !valid_filemode(entries[i]->mode)) {
giterr_set(GITERR_INDEX, "invalid filemode for stage %d entry",
i);
i + 1);
return -1;
}
}