Commit dbfd83bc6567763e6c363c462e9dd0628eaf3fe6

Edward Thomson 2014-02-03T19:56:13

Remove unused pointer assignment

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/src/merge.c b/src/merge.c
index 2ae02e5..ac973ef 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -2397,7 +2397,7 @@ int git_merge__indexes(git_repository *repo, git_index *index_new)
 
 	/* Remove removed items from the index */
 	git_vector_foreach(&paths, i, path) {
-		if ((e = git_index_get_bypath(index_new, path, 0)) == NULL) {
+		if (git_index_get_bypath(index_new, path, 0) == NULL) {
 			if ((error = git_index_remove(index_repo, path, 0)) < 0 &&
 				error != GIT_ENOTFOUND)
 				goto done;