summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | describe: rename _object() to _commit()Carlos Martín Nieto2014-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't describe arbitrary object, so let's give it the name of the one object type we accept.
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into cmn/describeCarlos Martín Nieto2014-09-30128-2342/+5324
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | object: introduce git_describe_object()nulltoken2014-04-303-1/+694
| | | | | | | | | |
| * | | | | | | | | oidmap: Enhance the khash wrappernulltoken2014-04-301-0/+13
| | | | | | | | | |
* | | | | | | | | | git_filter: dup the filter nameAnurag Gupta (OSG)2014-10-091-2/+11
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2599 from linquize/config-trailing-spacesEdward Thomson2014-10-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | config: Handle multiple spaces that follow a configuration value and precede a comment char
| * | | | | | | | | | config: Fix multiple trailing spaces before comments not completely trimmedLinquize2014-10-041-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2597 from ethomson/fixupEdward Thomson2014-10-091-1/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Trivial fixups
| * | | | | | | | | | repository_head_unborn: clear error when HEAD is unbornEdward Thomson2014-10-031-1/+3
| |/ / / / / / / / /
* | | | | | | | | | Fix an uninitialized variableCarlos Martín Nieto2014-10-091-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2448 from libgit2/cmn/reference-transactionEdward Thomson2014-10-0910-36/+522
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Introduce reference transactions
| * | | | | | | | | | transaction: rename lock() to lock_ref()cmn/reference-transactionCarlos Martín Nieto2014-10-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leaves space for future expansion to locking other resources without having to change the API for references.
| * | | | | | | | | | stash: use a transaction to modify the reflogCarlos Martín Nieto2014-09-301-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stash is implemented as the refs/stash reference and its reflog. In order to modify the reflog, we need avoid races by making sure we're the only ones allowed to modify the reflog. We achieve this via the transactions API. Locking the reference gives us exclusive write access, letting us modify and write it without races.
| * | | | | | | | | | Introduce reference transactionsCarlos Martín Nieto2014-09-306-22/+478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A transaction allows you to lock multiple references and set up changes for them before applying the changes all at once (or as close as the backend supports). This can be used for replication purposes, or for making sure some operations run when the reference is locked and thus cannot be changed.
| * | | | | | | | | | signature: add a dup function which takes a poolCarlos Martín Nieto2014-09-302-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used by the transaction code.
| * | | | | | | | | | reflog: constify byindexCarlos Martín Nieto2014-09-301-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2462 from libgit2/cmn/remote-fetch-refsEdward Thomson2014-10-093-27/+146
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Implement opportunistic ref updates
| * | | | | | | | | | remote: implement opportunistic remote-tracking branch updatescmn/remote-fetch-refsCarlos Martín Nieto2014-09-302-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a list of refspecs is passed to fetch (what git would consider refspec passed on the command-line), we not only need to perform the updates described in that refspec, but also update the remote-tracking branch of the fetched remote heads according to the remote's configured refspecs. These "fetches" are not however to be written to FETCH_HEAD as they would be duplicate data, and it's not what the user asked for.
| * | | | | | | | | | remote: store passive refspecsCarlos Martín Nieto2014-09-302-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configured/base fetch refspecs need to be taken into account in order to implement opportunistic remote-tracking branch updates. DWIM them and store them in the struct, but don't do anything with them yet.
| * | | | | | | | | | remote: don't DWIM refspecs unnecessarilyCarlos Martín Nieto2014-09-301-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can only DWIM when we've connected to the remote and have the list of the remote's references. Adding or setting the refspecs should not trigger an attempt to DWIM the refspecs as we typically cannot do it, and even if we did, we would not use them for the current fetch.
| * | | | | | | | | | remote: allow overriding the refspecs for download and fetchCarlos Martín Nieto2014-09-302-8/+37
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With opportunistic ref updates, git has introduced the concept of having base refspecs *and* refspecs that are active for a particular fetch. Let's start by letting the user override the refspecs for download.
* | | | | | | | | | Extract shared functionality.Arthur Schreiber2014-10-091-55/+41
| | | | | | | | | |
* | | | | | | | | | Add git_merge_bases_many.Arthur Schreiber2014-10-091-0/+67
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | hashsig: Export as a `sys` headervmg/hashsigVicent Marti2014-10-014-75/+3
| | | | | | | | |
* | | | | | | | | path: fix invalid accessErdur2014-09-301-1/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #2581 from jacquesg/stash-ignored-directoriesEdward Thomson2014-09-291-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Stash ignored directories
| * | | | | | | | Recurse ignored directories when stashingJacques Germishuys2014-09-261-3/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2584 from jacquesg/pool-alignmentEdward Thomson2014-09-295-26/+40
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Pool/Index data is not aligned
| * | | | | | | | Ensure patch is initialized to zero, otherwise, the allocated flag may be setJacques Germishuys2014-09-261-0/+1
| | | | | | | | |
| * | | | | | | | Silence uninitialized warningJacques Germishuys2014-09-261-1/+1
| | | | | | | | |
| * | | | | | | | The raw index buffer content is not guaranteed to be alignedJacques Germishuys2014-09-261-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure alignment by copying the content into a structure on the stack
| * | | | | | | | Ensure pool data is aligned on an 8 byte boundaryJacques Germishuys2014-09-251-1/+1
| | | | | | | | |
| * | | | | | | | Introduce GIT_ALIGNJacques Germishuys2014-09-251-0/+8
| |/ / / / / / /
* | | | | | | | Merge pull request #2582 from swansontec/masterEdward Thomson2014-09-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correctly handle getaddrinfo return result
| * | | | | | | | Correctly handle getaddrinfo return resultWilliam Swanson2014-09-241-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The getaddrinfo function indicates failure with a non-zero return code, but this code is not necessarily negative. On platforms like Android where the code is positive, a failed call causes libgit2 to segfault.
* | | | | | | | Merge pull request #2559 from libgit2/cmn/free-tls-errorEdward Thomson2014-09-291-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | global: free the error message when exiting a thread
| * | | | | | | global: free the error message when exiting a threadcmn/free-tls-errorCarlos Martín Nieto2014-09-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we free the global state at thread termination, we must also free the error message in order not to leak the string once per thread.
* | | | | | | | Merge pull request #2567 from cirosantilli/factor-41Vicent Marti2014-09-173-5/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Factor 40 and 41 constants from source.
| * | | | | | | | Factor 40 and 41 constants from source.Ciro Santilli2014-09-163-5/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #2571 from libgit2/vmg/walk-up-pathVicent Marti2014-09-176-24/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix `git_path_walk_up` to work with non-rooted paths
| * | | | | | | | repository: Do not double-free configvmg/walk-up-pathThe rugged tests are fragile2014-09-171-8/+8
| | | | | | | | |
| * | | | | | | | StyleThe rugged tests are fragile2014-09-171-3/+2
| | | | | | | | |
| * | | | | | | | attr: Do not walk path if we're at the rootThe rugged tests are fragile2014-09-171-5/+8
| | | | | | | | |
| * | | | | | | | path: Fix `git_path_walk_up` to work with non-rooted pathsThe rugged tests are fragile2014-09-175-11/+26
| | | | | | | | |
* | | | | | | | | Merge pull request #2572 from cirosantilli/factor-voidVicent Marti2014-09-171-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Replace void casts with GIT_UNUSED.
| * | | | | | | | Replace void casts with GIT_UNUSED.Ciro Santilli2014-09-171-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #2464 from libgit2/cmn/host-cert-infoVicent Marti2014-09-179-77/+225
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Provide a callback for certificate validation
| * | | | | | | | winhttp: get rid of the cert ignore flagCarlos Martín Nieto2014-09-161-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings us back in line with the other transports.
| * | | | | | | | ssh: expose both hashesCarlos Martín Nieto2014-09-161-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user may have the data hashed as MD5 or SHA-1, so we should provide both types for consumption.
| * | | | | | | | ssh: provide our own types for host key lengthsCarlos Martín Nieto2014-09-161-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the libssh2 defines, provide our own, which eases usage as we do not need to check whether libgit2 was built with libssh2 or not.
View Lorry Controller Status