diff options
| author | Carlos Martín Nieto <carlos@cmartin.tk> | 2011-11-18 22:45:56 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <carlos@cmartin.tk> | 2011-11-18 22:45:56 +0100 |
| commit | bdd31dd5e832126b2f22fccbe244a1106c241ab0 (patch) | |
| tree | b08a2ad0fad57131563aa8c071221bea241128c1 /src/fetch.c | |
| parent | 277b7efe493887081ce1dafd91199d0ee9f676c9 (diff) | |
| parent | e4c93a392763a006d11e1c1dd01c12f85498dad5 (diff) | |
| download | libgit2-error-handling.tar.gz | |
Merge branch 'development' into error-handlingerror-handling
The code in this branch has been modified so it works with the global
state introduced in development.
Diffstat (limited to 'src/fetch.c')
| -rw-r--r-- | src/fetch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fetch.c b/src/fetch.c index ac7282819..af7dbaffd 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -14,6 +14,7 @@ #include "transport.h" #include "remote.h" #include "refspec.h" +#include "pack.h" #include "fetch.h" #include "netops.h" @@ -181,7 +182,7 @@ int git_fetch__download_pack(char **out, const char *buffered, size_t buffered_s } /* A bit dodgy, but we need to keep the pack at the temporary path */ - error = git_filebuf_commit_at(&file, file.path_lock); + error = git_filebuf_commit_at(&file, file.path_lock, GIT_PACK_FILE_MODE); cleanup: if (error < GIT_SUCCESS) git_filebuf_cleanup(&file); |