index: correctly report which conflict stage has a wrong filemode

carlosmn · carlosmn · commit 16604d74697c · 2015-11-12T12:11:45.000+01:00
When we're at offset 'i', we're dealing with the 'i+1' stage, since
conflicts start at 1.
diff --git 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;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1691,7 +1691,7 @@ int git_index_conflict_add(git_index *index,`
`1691`	`1691`	`for (i = 0; i < 3; i++) {`
`1692`	`1692`	`if (entries[i] && !valid_filemode(entries[i]->mode)) {`
`1693`	`1693`	`giterr_set(GITERR_INDEX, "invalid filemode for stage %d entry",`
`1694`		`- i);`
	`1694`	`+ i + 1);`
`1695`	`1695`	`return -1;`
`1696`	`1696`	`}`
`1697`	`1697`	`}`