summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* describe: document the APIcmn/describeCarlos Martín Nieto2014-09-301-3/+71
|
* describe: make mingw happyCarlos Martín Nieto2014-09-301-2/+2
| | | | The MinGW compiler does not like it when we declare a typedef twice.
* describe: rename git_describe_opts to git_describe_optionsCarlos Martín Nieto2014-09-306-32/+46
| | | | And implement the option init functions for this and the format options.
* describe: use globs in the testsCarlos Martín Nieto2014-09-304-49/+34
| | | | | This makes us be closer to git's tests, and lets us better describe what we expect from the output.
* describe: implement abbreviated idsCarlos Martín Nieto2014-09-301-6/+27
|
* describe: implement describing the workdirCarlos Martín Nieto2014-09-305-6/+102
| | | | | | When we describe the workdir, we perform a describe on HEAD and then check to see if the worktree is dirty. If it is and we have a suffix string, we append that to the buffer.
* describe: split into gather and format stepsCarlos Martín Nieto2014-09-306-101/+242
| | | | | | | | Instead of printing out to the buffer inside the information-gathering phase, write the data to a intermediate result structure. This allows us to split the options into gathering options and formatting options, simplifying the gathering code.
* describe: rename _object() to _commit()Carlos Martín Nieto2014-09-304-4/+4
| | | | | 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-30337-4231/+11818
|\
| * the wiki, it is deadBrendan Forster2014-09-301-2/+1
| |
| * Merge pull request #2581 from jacquesg/stash-ignored-directoriesEdward Thomson2014-09-292-3/+22
| |\ | | | | | | Stash ignored directories
| | * Recurse ignored directories when stashingJacques Germishuys2014-09-261-3/+5
| | |
| | * Added test for stashing files in ignored directoriesJacques Germishuys2014-09-241-0/+17
| | |
| * | Merge pull request #2584 from jacquesg/pool-alignmentEdward Thomson2014-09-298-29/+43
| |\ \ | | | | | | | | Pool/Index data is not aligned
| | * | Silence unused return value warningJacques Germishuys2014-09-261-1/+1
| | | |
| | * | 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
| | | |
| | * | Fixed odb foreach test failure for big-endian 64-bitJakub Čajka2014-09-261-1/+1
| | | |
| | * | Fixed merge REUC test for big-endian 64-bitJakub Čajka2014-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-292-0/+17
| |\ \ | | | | | | | | 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-142-0/+17
| | | | | | | | | | | | | | | | | | | | 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 #2570 from cirosantilli/rm-unused-varCarlos Martín Nieto2014-09-250-0/+0
| |\ \ \ | | |_|/ | |/| | Remove unused buf variable from path/core test.
| | * | Remove unused buf variable from path/core test.Ciro Santilli2014-09-161-2/+0
| | | |
| * | | Add a note about cert check in the CHANGELOGCarlos Martín Nieto2014-09-241-0/+4
| | | |
| * | | Merge pull request #2567 from cirosantilli/factor-41Vicent Marti2014-09-1712-24/+25
| |\ \ \ | | | | | | | | | | Factor 40 and 41 constants from source.
| | * | | Factor 40 and 41 constants from source.Ciro Santilli2014-09-1612-24/+25
| | |/ /
| * | | travis: another attempt at multiple allowed failuresCarlos Martín Nieto2014-09-171-3/+2
| | | | | | | | | | | | | | | | | | | | It looks like what Travis wants is a list of hashes, rather than a hash with a list.
| * | | Merge pull request #2571 from libgit2/vmg/walk-up-pathVicent Marti2014-09-179-41/+86
| |\ \ \ | | | | | | | | | | 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
| | | | |
| | * | | attr: Add an extra test for files under a subfolderThe rugged tests are fragile2014-09-171-0/+7
| | | | |
| | * | | path: Fix `git_path_walk_up` to work with non-rooted pathsThe rugged tests are fragile2014-09-177-28/+64
| | | | |
| * | | | travis: fix allowed failures listCarlos Martín Nieto2014-09-171-2/+2
| | | | |
| * | | | Merge pull request #2572 from cirosantilli/factor-voidVicent Marti2014-09-172-4/+4
| |\ \ \ \ | | |/ / / | |/| | | Replace void casts with GIT_UNUSED.
| | * | | Replace void casts with GIT_UNUSED.Ciro Santilli2014-09-172-4/+4
| | |/ /
| * | | Merge pull request #2464 from libgit2/cmn/host-cert-infoVicent Marti2014-09-1717-91/+422
| |\ \ \ | | | | | | | | | | Provide a callback for certificate validation
| | * | | ssh: skip the localhost cert check earliercmn/host-cert-infoCarlos Martín Nieto2014-09-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Skip it before we attempt to clone, as we would exit with -1 on systems which do not have sshd running.
| | * | | 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-163-22/+38
| | | | | | | | | | | | | | | | | | | | | | | | | 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-163-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | script: use a parallel build on TravisCarlos Martín Nieto2014-09-161-1/+1
| | | | |
| | * | | net: use only structs to pass information about certCarlos Martín Nieto2014-09-166-19/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of spreading the data in function arguments, some of which aren't used for ssh and having a struct only for ssh, use a struct for both, using a common parent to pass to the callback.
| | * | | Merge remote-tracking branch 'upstream/master' into cmn/host-cert-infoCarlos Martín Nieto2014-09-1639-159/+796
| | |\ \ \
| | * | | | ssh: add test for host keyCarlos Martín Nieto2014-09-162-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test that the certificate check callback gets the right fingerprint from the host we're connecting to.
View Lorry Controller Status