thodg/libgit2

diff --git a/src/index.c b/src/index.c
index 4907c81..0450d9f 100644
--- a/src/index.c
+++ b/src/index.c
@@ -1802,7 +1802,8 @@ int git_index_conflict_add(git_index *index,
 		if (entries[i] && !valid_filemode(entries[i]->mode)) {
 			giterr_set(GITERR_INDEX, "invalid filemode for stage %d entry",
 				i + 1);
-			return -1;
+			ret = -1;
+			goto on_error;
 		}
 	}