summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* error: store the error messages in a reusable buffercmn/error-bufferCarlos Martín Nieto2015-07-283-23/+42
| | | | | | | Instead of allocating a brand new buffer for each error string we want to store, we can use a per-thread buffer to store the error string and re-use the underlying storage. We already use the buffer to format the string, so this mostly makes that more direct.
* Merge pull request #3307 from libgit2/cmn/submodule-backslashEdward Thomson2015-07-243-0/+32
|\ | | | | Normalize submodule urls before looking at them
| * submodule, path: extract slash conversioncmn/submodule-backslashCarlos Martín Nieto2015-07-133-7/+24
| | | | | | | | Extract the backslash-to-slash conversion into a helper function.
| * submodule: normalize slashes in resolve_urlCarlos Martín Nieto2015-07-131-0/+15
| | | | | | | | | | | | Our path functions expect to work with slashes, so convert a path with backslashes into one with slashes at the top of the function.
* | Merge pull request #3303 from libgit2/cmn/index-add-submoduleEdward Thomson2015-07-242-2/+28
|\ \ | | | | | | Allow adding a submodule through git_index_add_bypath
| * | index: allow add_bypath to update submodulescmn/index-add-submoduleCarlos Martín Nieto2015-07-121-2/+22
| | | | | | | | | | | | | | | Similarly to how git itself does it, allow the index update operation to stage a change in a submodule's HEAD.
| * | blob: fail to create a blob from a dir with EDIRECTORYCarlos Martín Nieto2015-07-121-0/+6
| | | | | | | | | | | | | | | This also affects `git_index_add_bypath()` by providing a better error message and a specific error code when a directory is passed.
* | | Merge pull request #3305 from libgit2/cmn/reflog-del-backendEdward Thomson2015-07-242-12/+8
|\ \ \ | | | | | | | | refdb: delete a ref's reflog upon deletion
| * | | refdb: delete a ref's reflog upon deletioncmn/reflog-del-backendCarlos Martín Nieto2015-07-122-12/+8
| |/ / | | | | | | | | | | | | | | | Removing a reflog upon ref deletion is something which only some backends might wish to do. Backends which are database-backed may wish to archive a reflog, log-based ones may not need to do anything.
* | | Merge pull request #3304 from libgit2/cmn/checkout-free-streamEdward Thomson2015-07-241-7/+9
|\ \ \ | | | | | | | | filter: make sure to close the stream even on error
| * | | filter: make sure to close the stream even on errorcmn/checkout-free-streamCarlos Martín Nieto2015-07-121-7/+9
| |/ / | | | | | | | | | | | | When the stream list init or write fail, we must also make sure to close the stream, as that's the function contract.
* | | Merge pull request #3317 from csware/fix-vistaEdward Thomson2015-07-231-3/+8
|\ \ \ | | | | | | | | Make libgit2 work on Windows Vista again
| * | | Make libgit2 work on Windows Vista againSven Strickroth2015-07-221-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | (fixes issue #3316) Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | Merge branch 'master' into fix-init-orderingfix-init-orderingjoshaber2015-07-2238-118/+1004
|\ \ \ \ | |/ / /
| * | | Merge pull request #3311 from Fallso/MacroRedefinitionEdward Thomson2015-07-151-0/+2
| |\ \ \ | | | | | | | | | | Fix macro redefinition warning
| | * | | Fix macro redefinition warningFallso2015-07-151-0/+2
| | | | |
| * | | | Merge pull request #3302 from libgit2/cmn/submodule-foreach-diff-pathCarlos Martín Nieto2015-07-131-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | | List a submodule only once when the path matches a submodule in the index
| | * | | submodule: lookup the submodule by path if availablecmn/submodule-foreach-diff-pathCarlos Martín Nieto2015-07-111-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | If we get the path from the gitmodules file, look up the submodule we're interested in by path, rather then by name. Otherwise we might get duplicate results.
| * | | Merge branch 'portable-zu'Carlos Martín Nieto2015-07-127-14/+14
| |\ \ \ | | |_|/ | |/| |
| | * | Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-127-14/+14
| | | | | | | | | | | | | | | | The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
| * | | Merge pull request #3301 from ethomson/warningsCarlos Martín Nieto2015-07-103-2/+4
| |\ \ \ | | | | | | | | | | Clean up some warnings
| | * | | khash: add eol so picky compilers stop warningEdward Thomson2015-07-101-1/+1
| | | | |
| | * | | xdiff: cleanup some warningsEdward Thomson2015-07-102-1/+3
| | | | |
| * | | | Merge pull request #3297 from tkelman/patch-2Carlos Martín Nieto2015-07-101-0/+2
| |\ \ \ \ | | | | | | | | | | | | Fix undefined reference with old versions of openssl
| | * | | | Fix undefined reference with old versions of opensslTony Kelman2015-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions prior to 0.9.8f did not have this function, rhel/centos5 are still on a heavily backported version of 0.9.8e and theoretically supported until March 2017 Without this ifdef, I get the following link failure: ``` CMakeFiles/libgit2_clar.dir/src/openssl_stream.c.o: In function `openssl_connect': openssl_stream.c:(.text+0x45a): undefined reference to `SSL_set_tlsext_host_name' collect2: error: ld returned 1 exit status make[6]: *** [libgit2_clar] Error 1 ```
| * | | | | git_cert: child types use proper base typeEdward Thomson2015-07-105-13/+14
| | |/ / / | |/| | |
| * | | | Merge pull request #3281 from ethomson/wildcard_filtersCarlos Martín Nieto2015-07-091-2/+5
| |\ \ \ \ | | | | | | | | | | | | filters: custom filters with wildcard attributes
| | * | | | filters: custom filters with wildcard attributesEdward Thomson2015-07-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom filters with wildcard attributes, so that clients can support some random `filter=foo` in a .gitattributes and look up the corresponding smudge/clean commands in the configuration file.
| * | | | | xdiff: upgrade to core git 2.4.5Edward Thomson2015-07-0712-76/+137
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade xdiff to version used in core git 2.4.5 (0df0541). Corrects an issue where an LF is added at EOF while applying an unrelated change (ba31180), cleans up some unused code (be89977 and e5b0662), and provides an improved callback to avoid leaking internal (to xdiff) structures (467d348). This also adds some additional functionality that we do not yet take advantage of, namely the ability to ignore changes whose lines are all blank (36617af).
| * | | | Merge pull request #3277 from git-up/git_diff_index_to_indexCarlos Martín Nieto2015-07-071-0/+25
| |\ \ \ \ | | | | | | | | | | | | Added git_diff_index_to_index()
| | * | | | Added git_diff_index_to_index()Pierre-Olivier Latour2015-06-301-0/+25
| | | | | |
| * | | | | Merge pull request #3288 from ethomson/getenvCarlos Martín Nieto2015-07-075-17/+95
| |\ \ \ \ \ | | | | | | | | | | | | | | git__getenv: utf-8 aware env reader
| * \ \ \ \ \ Merge pull request #3202 from jeffhostetler/windows_stack_traceCarlos Martín Nieto2015-07-067-7/+794
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Stacktraces with CRTDBG memory leaks on Windows
| | * | | | | Reserve aux_id 0; sort leaks by aux_id. Fix cmp.Jeff Hostetler2015-06-292-10/+28
| | | | | | |
| | * | | | | Include stacktrace summary in memory leak output.Jeff Hostetler2015-06-297-7/+776
| | | | | | |
| * | | | | | iterator_walk: cast away constness for freeEdward Thomson2015-07-021-2/+2
| | | | | | |
| * | | | | | submodule: correctly delimit the keys to use for lookupcmn/submodule-duplicateCarlos Martín Nieto2015-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regex we use to look at the gitmodules file does not correctly delimit the name of submodule which we want to look up and puts '.*' straight after the name, maching on any submodule which has the seeked submodule as a prefix of its name. Add the missing '\.' in the regex so we want a full stop to exist both before and after the submodule name.
| * | | | | | Fix 8.3 filename tests failure when 8.3 is disabledLinquize2015-07-011-1/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Increment `git__n_inits` before doing `init_once`.joshaber2015-07-221-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | Fixes #3318.
* | | | | git__getenv: utf-8 aware env readerEdward Thomson2015-07-025-17/+95
|/ / / / | | | | | | | | | | | | | | | | | | | | Introduce `git__getenv` which is a UTF-8 aware `getenv` everywhere. Make `cl_getenv` use this to keep consistent memory handling around return values (free everywhere, as opposed to only some platforms).
* | | | Fix #3093 - remove declaration of unused function git_fetch__download_packMatthew Plough2015-06-301-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | Function was added in commit 2c982daa2eec64b80c7940bfe1142295bd72edd8 on October 5, 2011, and removed in commit 41fb1ca0ec51ad1d2a14b911aab3215e42965d1b on October 29, 2012. Given the length of time it's gone unused, it's safe to remove now.
* | | | Merge pull request #3273 from ethomson/warnings3Carlos Martín Nieto2015-06-303-2/+2
|\ \ \ \ | | | | | | | | | | More warnings
| * | | | winhttp: remove unused varEdward Thomson2015-06-301-1/+0
| | | | |
| * | | | posix compat: include sys/stat.h for mingwEdward Thomson2015-06-301-0/+1
| | | | |
| * | | | diff: use size_t formatEdward Thomson2015-06-301-1/+1
| | |/ / | |/| |
* | | | http: fixed leak when asking for credentials againPierre-Olivier Latour2015-06-301-0/+4
|/ / / | | | | | | | | | | | | t->cred might have been allocated the previous time and needs to be freed before asking caller for credentials again.
* | | Merge pull request #3271 from jeffhostetler/more_leaksEdward Thomson2015-06-301-0/+3
|\ \ \ | | | | | | | | memory leak refspec.c
| * | | fix memory leak in refspec.c on errors.Jeff Hostetler2015-06-301-0/+3
| |/ /
* | | Merge pull request #3270 from ethomson/warnings2Carlos Martín Nieto2015-06-305-9/+4
|\ \ \ | |/ / |/| | Remove some warnings
| * | odb: cast to long long for printfEdward Thomson2015-06-291-1/+1
| | |
View Lorry Controller Status