From 16604d74697cff526b0fc1cd2b03bedd56641059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <cmn@dwim.me>
Date: Wed, 11 Nov 2015 00:36:15 +0100
Subject: [PATCH] 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.
---
 src/index.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 		}
 	}