diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-11-11 00:36:15 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-11-12 12:11:45 +0100 |
| commit | 16604d74697cff526b0fc1cd2b03bedd56641059 (patch) | |
| tree | c2206bdcb6804ea49fd371ef13e406940a568338 | |
| parent | 1314af8d63ca5d12af585e68ae0334f68c0b980e (diff) | |
| download | libgit2-16604d74697cff526b0fc1cd2b03bedd56641059.tar.gz | |
index: correctly report which conflict stage has a wrong filemode
When we're at offset 'i', we're dealing with the 'i+1' stage, since
conflicts start at 1.
| -rw-r--r-- | src/index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/index.c b/src/index.c index dcf46fe50..f9fff27ba 100644 --- a/src/index.c +++ b/src/index.c @@ -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; } } |