summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2014-02-03 19:56:13 -0800
committerEdward Thomson <ethomson@microsoft.com>2014-02-03 19:56:34 -0800
commitdbfd83bc6567763e6c363c462e9dd0628eaf3fe6 (patch)
tree033c0bd32863aecf7f4b7e006ea97ff251cfb6f3 /src
parentc0b10c25e02c6922276567600988fb2b85aeede1 (diff)
downloadlibgit2-dbfd83bc6567763e6c363c462e9dd0628eaf3fe6.tar.gz
Remove unused pointer assignment
Diffstat (limited to 'src')
-rw-r--r--src/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c
index 2ae02e54d..ac973efd0 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;