summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* index: stage an unregistered submodule as wellcmn/add-unreg-submoduleCarlos Martín Nieto2015-08-011-5/+58
| | | | | | We previously added logic to `_add_bypath()` to update a submodule. Go further and stage the submodule even if it's not registered to behave like git.
* index: test that an unregistered submodule gets stagedCarlos Martín Nieto2015-08-011-1/+7
| | | | | | When we pass the path of a repository to `_bypath()`, we should behave like git and stage it as a `_COMMIT` regardless of whether it is registered a a submodule.
* index: add test for adding an old-style submodule to indexLinquize2015-08-011-0/+7
|
* Merge pull request #3332 from phatblat/ben/doc-warningsCarlos Martín Nieto2015-08-018-10/+13
|\ | | | | Resolve documentation warnings
| * Better param docsBen Chatelain2015-07-281-1/+3
| |
| * Fix remaining documentation warningsBen Chatelain2015-07-274-4/+4
| |
| * Add -Wdocumentation flag if supportedBen Chatelain2015-07-271-0/+1
| |
| * Use correct Doxygen trailing comment syntaxBen Chatelain2015-07-271-4/+4
| |
| * Fix @param names in doc commentsBen Chatelain2015-07-273-3/+3
| |
* | Merge pull request #3341 from stewid/pedantic-compiler-warningEdward Thomson2015-07-315-6/+6
|\ \ | | | | | | Remove extra semicolon outside of a function
| * | Remove extra semicolon outside of a functionStefan Widgren2015-07-315-6/+6
|/ / | | | | | | | | Without this change, compiling with gcc and pedantic generates warning: ISO C does not allow extra ‘;’ outside of a function.
* | Merge pull request #3328 from libgit2/cmn/iterator-skip-diriterEdward Thomson2015-07-292-6/+5
|\ \ | | | | | | iterator: skip over errors in diriter init
| * | iterator: adjust unreadable-dir test to new behaviourcmn/iterator-skip-diriterCarlos Martín Nieto2015-07-271-5/+1
| | | | | | | | | | | | | | | We don't want the iterator to make us stop whenever we hit an unreadable dir. We should instead move over to the next item.
| * | iterator: skip over errors in diriter initCarlos Martín Nieto2015-07-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | An error here will typically mean that the directory was removed between the time we iterated the parent and the time we wanted to visit it in which case we should ignore it. Other kinds of errors such as permissions (or transient errors) also better dealt with by pretending we didn't see it.
* | | Merge pull request #3339 from palmin/palmin-issue-3338Edward Thomson2015-07-291-1/+1
|\ \ \ | | | | | | | | case-insensitive check for WWW-Authenticate header
| * | | case-insensitive check for WWW-Authenticate headerAnders Borum2015-07-291-1/+1
|/ / / | | | | | | Fixes issue #3338
* | | Merge pull request #3307 from libgit2/cmn/submodule-backslashEdward Thomson2015-07-244-0/+55
|\ \ \ | | | | | | | | 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.
| * | | submodule: add failing test for backslash in urlCarlos Martín Nieto2015-07-131-0/+23
| | | |
* | | | Merge pull request #3303 from libgit2/cmn/index-add-submoduleEdward Thomson2015-07-245-2/+65
|\ \ \ \ | | | | | | | | | | Allow adding a submodule through git_index_add_bypath
| * | | | index: allow add_bypath to update submodulescmn/index-add-submoduleCarlos Martín Nieto2015-07-122-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | 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-123-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | This also affects `git_index_add_bypath()` by providing a better error message and a specific error code when a directory is passed.
| * | | | errors: add EDIRECTORYCarlos Martín Nieto2015-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This is to be returned when the operation which the user asked for is not possible to do on a directory.
* | | | | Merge pull request #3305 from libgit2/cmn/reflog-del-backendEdward Thomson2015-07-245-14/+17
|\ \ \ \ \ | | | | | | | | | | | | refdb: delete a ref's reflog upon deletion
| * | | | | refdb: delete a ref's reflog upon deletioncmn/reflog-del-backendCarlos Martín Nieto2015-07-125-14/+17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #3322 from libgit2/fix-init-orderingJosh Abernathy2015-07-221-1/+1
|\ \ \ \ | |/ / / |/| | | Increment `git__n_inits` before doing `init_once`.
| * | | Merge branch 'master' into fix-init-orderingfix-init-orderingjoshaber2015-07-2266-379/+1753
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3315 from rcorre/docfixCarlos Martín Nieto2015-07-201-1/+9
|\ \ \ \ | | | | | | | | | | Document git_fetch_options struct and fix typo.
| * | | | Document git_fetch_options struct and fix typo.Ryan Roden-Corrent2015-07-201-1/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_fetch_options was missing from the API docs because it lacked a documentation comment above the struct declaration. I used the git_checkout_options docstring as a template. Also fixes a typo in git_remote_prune_refs (remote, not reamote).
* | | | 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-132-1/+19
|\ \ \ \ \ | | | | | | | | | | | | 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.
| * | | | | submdule: reproduce double-reporting of a submodule in foreachCarlos Martín Nieto2015-07-111-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we rename a submodule, we should be merging two sets of information based on whether their path is the same. We currently only deduplicate on equal name, which causes us to double-report.
* | | | | | Merge pull request #3306 from libgit2/cmn/fetch-ex-fetchCarlos Martín Nieto2015-07-131-74/+27
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | examples: modernise the fetch example
| * | | | | examples: modernise the fetch examplecmn/fetch-ex-fetchCarlos Martín Nieto2015-07-121-74/+27
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Under normal conditions, git_remote_fetch() should be the only function used to perform a fetch. Don't let the example lead people astray.
* | | | | Merge branch 'portable-zu'Carlos Martín Nieto2015-07-1211-20/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-1211-20/+20
| | | | | | | | | | | | | | | | | | | | 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 #3292 from tkelman/patch-1Edward Thomson2015-07-112-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Increase required version of cmake to 2.8
| * | | | | Increase required version of cmake to 2.8Tony Kelman2015-07-102-2/+2
| | | | | |
* | | | | | Merge pull request #3301 from ethomson/warningsCarlos Martín Nieto2015-07-105-13/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clean up some warnings
| * | | | | | khash: add eol so picky compilers stop warningEdward Thomson2015-07-101-1/+1
| | | | | | |
| * | | | | | wildcard filters: move CHANGELOG message to 0.23+1Edward Thomson2015-07-102-6/+5
| | | | | | |
| * | | | | | wildcard filters: clean up some warnings in testsEdward Thomson2015-07-101-5/+9
| | | | | | |
| * | | | | | xdiff: cleanup some warningsEdward Thomson2015-07-102-1/+3
| | | | | | |