summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <carlosmn@github.com>2016-03-31 04:12:46 -0700
committerCarlos Martín Nieto <carlosmn@github.com>2016-03-31 04:12:46 -0700
commitd53cc13e3a66e1b14a249bf48cc30d9fc31e9672 (patch)
tree50e80e8c1b99a42e1cab9bb8401400dd1f4a1ffc
parentbd4ef3373b02541bdd55b8e2ea803f4672681734 (diff)
parentd4e4f2720407584ca3ecba4704ffeb3c5cbd3702 (diff)
downloadlibgit2-d53cc13e3a66e1b14a249bf48cc30d9fc31e9672.tar.gz
Merge pull request #3575 from pmq20/master-13jan16
Remove duplicated calls to git_mwindow_close
-rw-r--r--src/indexer.c1
-rw-r--r--src/pack.c3
2 files changed, 0 insertions, 4 deletions
diff --git a/src/indexer.c b/src/indexer.c
index ce039257d..a3a866989 100644
--- a/src/indexer.c
+++ b/src/indexer.c
@@ -777,7 +777,6 @@ static int fix_thin_pack(git_indexer *idx, git_transfer_progress *stats)
curpos = delta->delta_off;
error = git_packfile_unpack_header(&size, &type, &idx->pack->mwf, &w, &curpos);
- git_mwindow_close(&w);
if (error < 0)
return error;
diff --git a/src/pack.c b/src/pack.c
index e8bde71f3..e7003e66d 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -494,7 +494,6 @@ int git_packfile_resolve_header(
int error;
error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos);
- git_mwindow_close(&w_curs);
if (error < 0)
return error;
@@ -517,7 +516,6 @@ int git_packfile_resolve_header(
while (type == GIT_OBJ_OFS_DELTA || type == GIT_OBJ_REF_DELTA) {
curpos = base_offset;
error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos);
- git_mwindow_close(&w_curs);
if (error < 0)
return error;
if (type != GIT_OBJ_OFS_DELTA && type != GIT_OBJ_REF_DELTA)
@@ -585,7 +583,6 @@ static int pack_dependency_chain(git_dependency_chain *chain_out,
elem->base_key = obj_offset;
error = git_packfile_unpack_header(&size, &type, &p->mwf, &w_curs, &curpos);
- git_mwindow_close(&w_curs);
if (error < 0)
goto on_error;