summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix checkout behavior when its hands are tiedRussell Belfer2012-11-092-120/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So, @nulltoken created a failing test case for checkout that proved to be particularly daunting. If checkout is given only a very limited strategy mask (e.g. just GIT_CHECKOUT_CREATE_MISSING) then it is possible for typechange/rename modifications to leave it unable to complete the request. That's okay, but the existing code did not have enough information not to generate an error (at least for tree/blob conflicts). This led me to a significant reorganization of the code to handle the failing case, but it has three benefits: 1. The test case is handled correctly (I think) 2. The new code should actually be much faster than the old code since I decided to make checkout aware of diff list internals. 3. The progress value accuracy is hugely increased since I added a fourth pass which calculates exactly what work needs to be done before doing anything.
| * | Extensions to rmdir and mkdir utilitiesRussell Belfer2012-11-0914-90/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rework GIT_DIRREMOVAL values to GIT_RMDIR flags, allowing combinations of flags * Add GIT_RMDIR_EMPTY_PARENTS flag to remove parent dirs that are left empty after removal * Add GIT_MKDIR_VERIFY_DIR to give an error if item is a file, not a dir (previously an EEXISTS error was ignored, even for files) and enable this flag for git_futils_mkpath2file call * Improve accuracy of error messages from git_futils_mkdir
* | | makefile: Fix the builtin MakefileVicent Marti2012-11-131-1/+1
| |/ |/|
* | config: rename get_config_entry -> config_entryCarlos Martín Nieto2012-11-133-3/+3
| | | | | | | | | | We're already in the git_config namespace, there is no need to repeat it.
* | Merge pull request #1055 from ethomson/sha1_win32Vicent Martí2012-11-1322-198/+734
|\ \ | | | | | | Win32 CryptoAPI and CNG support for SHA1
| * | filebuf now has a git_hash_ctx instead of a ctx*Edward Thomson2012-11-132-18/+17
| | |
| * | unload dll / destroy hash ctxs at shutdownEdward Thomson2012-11-137-0/+37
| | |
| * | move hash library func ptrs to global globalEdward Thomson2012-11-138-56/+98
| | |
| * | Remove git_hash_ctx_new - callers now _ctx_init()Edward Thomson2012-11-1315-175/+90
| | |
| * | Win32 CryptoAPI and CNG support for SHA1Edward Thomson2012-11-1317-138/+681
| | |
* | | Merge pull request #1064 from libgit2/http-parser-2Vicent Martí2012-11-132-647/+1079
|\ \ \ | |/ / |/| | Bump the builtin http-parser to v2.0
| * | Bump the builtin http-parserhttp-parser-2Vicent Marti2012-11-122-647/+1079
| | |
* | | Merge pull request #1065 from nulltoken/fix/memory-leakBen Straub2012-11-132-0/+3
|\ \ \ | | | | | | | | Fix memory leaks
| * | | test: fix memory leaknulltoken2012-11-131-0/+2
| | | |
| * | | local: fix memory leaknulltoken2012-11-131-0/+1
| |/ /
* | | Remove unused variablesMichael Schubert2012-11-132-2/+0
|/ /
* | clar-helpers: Oops, grab pointerVicent Marti2012-11-121-1/+1
| |
* | Merge remote-tracking branch 'ben/local-transport' into developmentVicent Marti2012-11-1235-104/+277
|\ \
| * | Remove unnecessary progress logicBen Straub2012-11-121-4/+0
| | | | | | | | | | | | | | | The indexer handles this better than the fetch logic does.
| * | Fix error checkBen Straub2012-11-121-1/+1
| | |
| * | Helpers for local-filesystem remote URLsBen Straub2012-11-095-135/+63
| | |
| * | Avoid copying duplicate commitsBen Straub2012-11-091-7/+8
| | |
| * | Local fetch: add testsBen Straub2012-11-0930-0/+124
| | |
| * | Implement local transport's fetchBen Straub2012-11-092-14/+138
| | |
* | | Merge pull request #1061 from nulltoken/topic/explicit-head-errorsVicent Martí2012-11-128-4/+52
|\ \ \ | | | | | | | | repository: Refine repository_head() error report
| * | | repository: Refine repository_head() error reportnulltoken2012-11-127-3/+51
| | | |
| * | | Fix compilation warningnulltoken2012-11-121-1/+1
|/ / /
* | | Merge pull request #1010 from ethomson/fetch_headEdward Thomson2012-11-1112-3/+542
|\ \ \ | | | | | | | | create FETCH_HEAD specially instead of as a ref file
| * | | create FETCH_HEAD specially instead of as a ref fileEdward Thomson2012-11-1112-3/+542
|/ / /
* | | Merge pull request #1056 from nulltoken/duplicate-tree-entriesVicent Martí2012-11-105-2/+197
|\ \ \ | | | | | | | | Duplicate tree entries
| * | | index: prevent tree creation from a non merged statenulltoken2012-11-093-2/+54
| | | | | | | | | | | | | | | | Fix libgit2/libgit2sharp#243
| * | | index: Introduce git_index_has_conflicts()nulltoken2012-11-083-0/+26
| | | |
| * | | tree: enforce coverage of silent entry replacementnulltoken2012-11-081-0/+117
| |/ /
* | | Merge pull request #1060 from nulltoken/topic/explicit-index-errorsVicent Martí2012-11-104-29/+64
|\ \ \ | |_|/ |/| | Topic/explicit index errors
| * | index: prefer INDEX_OWNER usagenulltoken2012-11-101-1/+1
| | |
| * | index: refine add_from_workdir() error reportnulltoken2012-11-103-24/+48
| | |
| * | index: make git_index_new() work with a NULL pathnulltoken2012-11-102-1/+12
| | |
| * | tests: Add missing assertionsnulltoken2012-11-101-3/+3
|/ /
* | Merge pull request #1058 from pwkelley/developmentVicent Martí2012-11-093-6/+11
|\ \ | | | | | | Fixes for two segfaults
| * | Fix a mutex/critical section leakPhilip Kelley2012-11-091-0/+1
| | |
| * | Fix uninitialized memory in winhttp subtransport on 64-bitPhilip Kelley2012-11-091-1/+4
| | |
| * | Fix implementation of strndup to not overrunPhilip Kelley2012-11-091-5/+6
| | |
* | | Merge pull request #1059 from nulltoken/fix/config-open-levelVicent Martí2012-11-092-2/+13
|\ \ \ | |/ / |/| | config: make git_config_open_level() work with an empty config
| * | config: make git_config_open_level() work with an empty confignulltoken2012-11-092-2/+13
|/ /
* | Merge pull request #1052 from delanne/invalid_readVicent Martí2012-11-092-2/+4
|\ \ | | | | | | Valgrind reports Invalid Read when the configuration file contains some empty line
| * | - Update 'tests-clar/resources/config/config11' in order to reproduce the ↵delanne2012-11-082-2/+4
| | | | | | | | | | | | | | | | | | invalidread with the unittest (just added some \n at the end of the file) - Fix config_file.c
* | | Merge pull request #1057 from bts/patch-1Vicent Martí2012-11-091-4/+11
|\ \ \ | |_|/ |/| | Update documentation in remote.h
| * | Update documentation in remote.hBrian Schroeder2012-11-081-4/+11
|/ /
* | Merge pull request #1048 from pwkelley/basic_authPhilip Kelley2012-11-0811-123/+594
|\ \ | |/ |/| Basic authentication for http and winhttp
| * Don't store no_check_cert; fetch it on demandPhilip Kelley2012-11-062-24/+16
| |
View Lorry Controller Status