summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ssh: store error message immediately after a failed agent callcmn/ssh-errorsCarlos Martín Nieto2014-09-041-1/+7
| | | | | | | | | | | | | | When the call to the agent fails, we must retrieve the error message just after the function call, as other calls may overwrite it. As the agent authentication is the only one which has a teardown and there does not seem to be a way to get the error message from a stored error number, this tries to introduce some small changes to store the error from the agent. Clearing the error at the beginning of the loop lets us know whether the agent has already set the libgit2 error message and we should skip it, or if we should set it.
* Merge pull request #2543 from libgit2/cmn/known-transportsVicent Marti2014-09-033-56/+23
|\ | | | | Clean up transport lookup
| * remote: test for supported URLs in a single placeCarlos Martín Nieto2014-08-311-16/+9
| | | | | | | | | | Instead of using ifdefs to run the tests, use them to set when we expect to support a particular scheme and always have the tests in the code.
| * remote: get rid of git_remote_valid_url()Carlos Martín Nieto2014-08-313-32/+23
| | | | | | | | | | | | | | | | | | It does the same as git_remote_supported_url() but has a name which implies we'd check the URL for correctness while we're simply looking at the scheme and looking it up in our lists. While here, fix up the tests so we check all the combination of what's supported.
| * transport: return ENOTFOUND for HTTPS and SSH when they're not supportedCarlos Martín Nieto2014-08-311-0/+6
| | | | | | | | | | | | | | The previous commit makes it harder to figure out if the library was built with support for a particular transport. Roll back some of the changes and remove ssh:// and https:// from the list if we're being built without support for them.
| * transport: distinguish between unknown and unsupported transportsCarlos Martín Nieto2014-08-311-24/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Even when built without a SSH support, we know about this transport. It is implemented, but the current code makes us return an error message saying it's not. This is a leftover from the initial implementation of the transports when there were in fact transports we knew about but were not implemented. Instead, let the SSH transport itself say it cannot run, the same as we do for HTTPS.
* | Merge pull request #2530 from libgit2/jamill/relative_gitlinkVicent Marti2014-09-0310-41/+377
|\ \ | | | | | | Teach repository to use relative paths for git symbolic links
| * | Introduce option to use relative paths for repository work directoryjamill/relative_gitlinkJameson Miller2014-09-027-41/+256
| | | | | | | | | | | | | | | | | | | | | Teach git_repository_init_ext to use relative paths for the gitlink to the work directory. This is used when creating a sub repository where the sub repository resides in the parent repository's .git directory.
| * | Introduce git_path_make_relativeEdward Thomson2014-09-023-0/+121
| | |
* | | Merge pull request #2552 from KindDragon/masterVicent Marti2014-09-034-6/+3
|\ \ \ | |/ / |/| | Several CppCat warnings fixed
| * | Several CppCat warnings fixedArkady Shapkin2014-09-034-6/+3
| | |
* | | Merge pull request #2550 from KindDragon/patch-2Vicent Marti2014-09-031-0/+14
|\ \ \ | | | | | | | | .editorconfig added to repository
| * | | .editorconfig added to repositoryArkadiy Shapkin2014-09-031-0/+14
| |/ /
* | | Merge pull request #2545 from linquize/no-sshVicent Marti2014-09-031-0/+9
|\ \ \ | |/ / |/| | Skip SSH clone tests if libgit2 not built with GIT_SSH defined
| * | Skip SSH clone tests if libgit2 not built with GIT_SSH definedLinquize2014-09-011-0/+9
| | |
* | | Merge pull request #2548 from linquize/warning5Vicent Marti2014-09-011-1/+1
|\ \ \ | |_|/ |/| | Fix warning
| * | Fix warningLinquize2014-09-011-1/+1
| |/
* | Merge pull request #2544 from linquize/test-pushVicent Marti2014-08-311-2/+1
|\ \ | | | | | | MSVC does not support zero size array
| * | MSVC does not support zero size arrayLinquize2014-08-311-2/+1
|/ /
* | Merge pull request #2481 from libgit2/cmn/oidarrayVicent Marti2014-08-297-1/+169
|\ \ | |/ |/| merge: expose multiple merge bases
| * merge: expose multiple merge basescmn/oidarrayCarlos Martín Nieto2014-07-277-1/+169
| | | | | | | | | | | | | | | | We always calculate multiple merge bases, but up to now we had only exposed the "best" merge base. Introduce git_oidarray which analogously to git_strarray lets us return multiple ids.
* | Merge pull request #2539 from libgit2/cmn/ahead-behind-orderVicent Marti2014-08-282-20/+20
|\ \ | | | | | | Fix ahead-behind results
| * | graph: fix ahead-behind logiccmn/ahead-behind-orderCarlos Martín Nieto2014-08-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we see PARENT1, it means there is a local commit and thus we are ahead. Likewise, seeing PARENT2 means that the upstream branch has a commit and we are one more behind. The logic is currently reversed. Correct it. This fixes #2501.
| * | Fix ahead-behind testsCarlos Martín Nieto2014-08-281-18/+18
| | | | | | | | | | | | | | | The logic was reversed. I have checked manually each pair with git and adjusted the expectation to what git status prints.
* | | Merge pull request #2538 from libgit2/ntk/propagate_url_parsing_errorVicent Marti2014-08-272-3/+9
|\ \ \ | | | | | | | | winhttp: Prevent swallowing of url parsing error
| * | | winhttp: Prevent swallowing of url parsing errornulltoken2014-08-272-3/+9
| | | |
* | | | Merge pull request #2502 from rnowosielski/remote_set_timeoutVicent Marti2014-08-271-1/+17
|\ \ \ \ | | | | | | | | | | Set timeout on remote (Add timeout for WinHttpReceiveResponse #2147)
| * | | | Set timeout on remote (WinHTTP) should return error in case of failure. ↵Rafal Nowosielski2014-08-271-7/+15
| | | | | | | | | | | | | | | | | | | | Connection timeout set to 1 minute. Read/Write timeout remains set to infinite #2147
| * | | | Set timeout on remote (WinHTTP) to infinite #2147Rafal Nowosielski2014-08-231-0/+8
| | | | |
* | | | | Merge pull request #2490 from csware/ssh-wintunnelVicent Marti2014-08-272-20/+92
|\ \ \ \ \ | |_|/ / / |/| | | | Allow to override default ssh transport_cb - in order to allow third party ssh transports
| * | | | Added some testsSven Strickroth2014-08-271-0/+66
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Allow to override default ssh transport_cbSven Strickroth2014-08-261-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | W/o this patch it is not possible to have a third party ssh transport_cb if GIT_SSH is disabled or a third party transport_cb which has a higher priority than the default one. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | Adjust clone tests to USERNAME cred typeCarlos Martín Nieto2014-08-271-0/+3
| | | | |
* | | | | Merge branch 'cmn/ssh-retry'Carlos Martín Nieto2014-08-2710-39/+343
|\ \ \ \ \
| * | | | | Add ssh retry changes to CHANGELOGCarlos Martín Nieto2014-08-271-0/+6
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into cmn/ssh-retryCarlos Martín Nieto2014-08-27184-2119/+5260
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #2537 from libgit2/reduce-cache-contentionVicent Marti2014-08-272-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor git_cache to use an rwlock
| * | | | | | Refactor git_cache to use an rwlockJustin Spahr-Summers2014-08-262-10/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This significantly reduces contention when many threads are trying to read from the cache simultaneously.
* | | | | | Merge pull request #2508 from libgit2/rb/fix-ignore-slash-starVicent Marti2014-08-263-1/+117
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix bugs with negative ignores inside an ignored parent directory
| * | | | | | Demonstrate a trailing slash failure.rb/fix-ignore-slash-starRob Rix2014-08-081-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `git help ignore` has this to say about trailing slashes: > If the pattern ends with a slash, it is removed for the purpose of > the following description, but it would only find a match with a > directory. In other words, foo/ will match a directory foo and > paths underneath it, but will not match a regular file or a > symbolic link foo (this is consistent with the way how pathspec > works in general in Git). Sure enough, having manually performed the same steps as this test, `git status` tells us the following: # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # # new file: force.txt # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # ../.gitignore # child1/ # child2/ i.e. neither child1 nor child2 is ignored.
| * | | | | | For negative matches, always use leading dir matchRussell Belfer2014-08-081-1/+2
| | | | | | |
| * | | | | | status: failing test with slash-starCarlos Martín Nieto2014-08-081-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing 'bin/*' in the rules, this means we ignore very file inside bin/ individually, but do not ignore the directory itself. Thus the status listing should list both files under bin/, one untracked and one ignored.
| * | | | | | Fix rejection of parent dir of negated ignoresRussell Belfer2014-08-082-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While scanning through a directory hierarchy, this prevents a positive ignore match on a parent directory from blocking the scan of a directory when a negative match rule exists for files inside the directory.
* | | | | | | Merge pull request #2533 from jakebolewski/jcb/addjuliaVicent Marti2014-08-261-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add Julia to the language bindings list
| * | | | | | | add Julia to the language bindings listjake bolewski2014-08-251-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #2535 from libgit2/cmn/unpack-offsetVicent Marti2014-08-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | pack: return the correct final offset
| * | | | | | pack: return the correct final offsetcmn/unpack-offsetCarlos Martín Nieto2014-08-261-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The callers of git_packfile_unpack() expect the obj_offset argument to be set to the beginning of the next object. We were mistakenly returning the the offset of the object's data, which causes the CRC function to try to use the wrong offset. Set obj_offset to curpos instead of elem->offset to point to the next element and bring back expected behaviour.
* | | | | | Merge pull request #2532 from arthurschreiber/arthur/fix-merge-base-commit-checkVicent Marti2014-08-251-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | merge base: Correctly raise an error if a non-commit object is passed.
| * | | | | | merge base: Correctly raise an error if a non-commit object is passed.Arthur Schreiber2014-08-251-1/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #2531 from libgit2/rb/mkdir-allow-parent-failuresVicent Marti2014-08-252-3/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow mkdir helper to skip parent errors