summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* revwalk: detect when we're out of interesting commitscmn/odd-slowdownCarlos Martín Nieto2015-04-141-2/+22
| | | | | | | | | | | | | | When walking backwards and marking parents uninteresting, make sure we detect when the list of commits we have left has run out of uninteresting commits so we can stop marking commits as uninteresting. Failing to do so can mean that we walk the whole history marking everything uninteresting, which eats up time, CPU and IO for with useless work. While pre-marking does look for this, we still need to check during the main traversal as there are setups for which pre-marking does not leave enough information in the commits. This can happen if we push a commit and hide its parent.
* Merge pull request #2974 from libgit2/cmn/clone-everythingEdward Thomson2015-04-105-3/+97
|\ | | | | Make sure to pack referenced objects for non-branches
| * local: recusrively insert non-branch objects into the packfilecmn/clone-everythingCarlos Martín Nieto2015-03-171-1/+2
| | | | | | | | | | | | | | | | | | When we insert e.g. a tag or tagged object into the packfile, we must make sure to insert any referenced objects as well, or we will have broken links. Use the recursive version of packfile insertion to make sure we send over not just the tagged object but also the objects it references.
| * tree: add more correct error messages for not foundCarlos Martín Nieto2015-03-171-2/+2
| | | | | | | | | | Don't use the full path, as that's not what we are asserting does not exist, but just the subpath we were looking up.
| * packbuilder: introduce git_packbuilder_insert_recur()Carlos Martín Nieto2015-03-172-0/+48
| | | | | | | | | | | | This function recursively inserts the given object and any referenced ones. It can be thought of as a more general version of the functions to insert a commit or tree.
| * clone: add failing test for local transport with a tagCarlos Martín Nieto2015-03-171-0/+45
| | | | | | | | | | | | | | When there is a tag, we must make sure that we get all referenced objects from this tag as well. This failing test shows that e.g. when there is a tagged tree, we insert the top tree but do not descend, thus causing the clone to have broken links.
* | Merge pull request #3030 from linquize/symlink_supportedEdward Thomson2015-04-102-3/+52
|\ \ | | | | | | If work_dir is not specified, use repo_dir to test if symlink is supported
| * | Test: Create repo in while current dir is readonly and checkout symlinkLinquize2015-04-041-0/+47
| | |
| * | For bare repository, use repo_dir to test if symlinks are supportedLinquize2015-04-041-3/+5
| | |
* | | Merge branch 'pr/3035'Edward Thomson2015-04-101-4/+4
|\ \ \
| * | | ISO C90 forbids mixed declarations and codeJozef Matula2015-04-081-4/+4
| | | | | | | | | | | | | | | | | | | | GIT_UNUSED() macro generates code therefore it should be used after variable declarations.
* | | | Merge pull request #3038 from pks-t/fix-regcomp-retval-checkEdward Thomson2015-04-104-6/+18
|\ \ \ \ | | | | | | | | | | Fix checking of return value for regcomp.
| * | | | Fix checking of return value for regcomp.Patrick Steinhardt2015-04-104-6/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regcomp function returns a non-zero value if compilation of a regular expression fails. In most places we only check for negative values, but positive values indicate an error, as well. Fix this tree-wide, fixing a segmentation fault when calling git_config_iterator_glob_new with an invalid regexp.
* | | | Merge pull request #3033 from pks-t/describe-oid-fallbackEdward Thomson2015-04-084-2/+9
|\ \ \ \ | |/ / / |/| | | Fix describe without refs and OID fallbacks
| * | | describe: only abort without tags if fallback is not allowed.Patrick Steinhardt2015-04-072-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | When no reference names could be found we did error out when trying to describe a commit. This is wrong, though, when the option to fall back to a commit's object ID is set.
| * | | describe example: enable building by default.Patrick Steinhardt2015-04-072-0/+2
|/ / /
* | | Merge pull request #3031 from git-up/git_index_addEdward Thomson2015-04-042-2/+2
|\ \ \ | | | | | | | | Entry argument passed to git_index_add_frombuffer() should be const
| * | | Entry argument passed to git_index_add_frombuffer() should be constPierre-Olivier Latour2015-04-032-2/+2
| | | |
* | | | Merge pull request #3022 from ethomson/gitignore_vimEdward Thomson2015-04-011-0/+1
|\ \ \ \ | |/ / / |/| | | gitignore: ignore vim swapfiles
| * | | gitignore: ignore vim swapfilesEdward Thomson2015-03-301-0/+1
|/ / /
* | | Merge pull request #3011 from ethomson/filter_zero_tempbufEdward Thomson2015-03-2511-0/+25
|\ \ \ | | | | | | | | Clear temporary buffer when filtering
| * | | filter: clear the temp_buf if we're using oneEdward Thomson2015-03-251-0/+3
| | | | | | | | | | | | | | | | | | | | If we are using a temporary buffer for filtering, be sure to clear it before using it, in case the file that we are filtering is empty.
| * | | Illustrate bad checkout on WindowsJacques Germishuys2015-03-2510-0/+22
| | | |
* | | | Merge pull request #3017 from ethomson/leaksCarlos Martín Nieto2015-03-253-5/+7
|\ \ \ \ | | | | | | | | | | squash some leaks
| * | | | squash some leaksEdward Thomson2015-03-243-5/+7
|/ / / /
* | | | Merge pull request #2990 from leoyanggit/custom_paramEdward Thomson2015-03-247-12/+30
|\ \ \ \ | | | | | | | | | | Add a custom param to git_smart_subtransport_definition
| * | | | Add a custom param to git_smart_subtransport_definitionLeo Yang2015-03-187-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | The smart transport has already take the payload param. For the sub transport a payload param is useful for the implementer.
* | | | | Merge pull request #2986 from tkelman/mingw_winhttpEdward Thomson2015-03-249-33/+792
|\ \ \ \ \ | | | | | | | | | | | | WinHTTP for MinGW
| * | | | | Use swprintf_s everywhere except mingw.orgTony Kelman2015-03-192-5/+8
| | | | | |
| * | | | | set PKG_CONFIG_LIBDIR in toolchain-mingw32.cmakeTony Kelman2015-03-171-0/+2
| | | | | |
| * | | | | use a different .def file for 64 bitTony Kelman2015-03-162-2/+37
| | | | | |
| * | | | | Fix out-of-tree buildTony Kelman2015-03-161-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | link against crypt32 for CertFreeCertificateContext
| * | | | | Fix build on mingw-w64Alex Crichton2015-03-161-2/+2
| | | | | |
| * | | | | patch so mingw-w64 can buildklutzy2015-03-162-0/+16
| | | | | |
| * | | | | Win32: Enable WinHTTP for MinGWPhilip Kelley2015-03-168-34/+735
| | | | | |
* | | | | | Merge pull request #2947 from libgit2/cmn/notes-bufEdward Thomson2015-03-245-28/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | note: use a git_buf to return the default namespace
| * | | | | | note: use a git_buf to return the default namespacecmn/notes-bufCarlos Martín Nieto2015-03-175-28/+57
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The caller has otherwise no way to know how long the string will be allocated or ability to free it. This fixes #2944.
* | | | | | Merge pull request #2858 from pks-t/remote-squashedCarlos Martín Nieto2015-03-243-1/+279
|\ \ \ \ \ \ | | | | | | | | | | | | | | examples: add remote example.
| * | | | | | examples: add remote example.Patrick Steinhardt2015-03-193-1/+279
| | | | | | |
* | | | | | | Merge pull request #3010 from ethomson/checkout_invalid_path_errCarlos Martín Nieto2015-03-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | checkout: report correct invalid path
| * | | | | | | checkout: report correct invalid pathEdward Thomson2015-03-231-1/+1
| | | | | | | |
* | | | | | | | git: make sure to close the network streamCarlos Martín Nieto2015-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of a bad url or other error during the connection setup, we close the stream via free.
* | | | | | | | Merge pull request #3003 from shawnl/masterEdward Thomson2015-03-201-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | fix changelog
| * | | | | | | fix changelogShawn Landden2015-03-201-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #3000 from libgit2/vmg/mkdir-extEdward Thomson2015-03-191-5/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | mkdir-ext: Assume directories don't exist; fix all race cases
| * | | | | | mkdir-ext: Retry lstat on EEXIST racevmg/mkdir-extVicent Marti2015-03-191-5/+14
|/ / / / / /
* | | | | | Merge pull request #2996 from ethomson/dll_commentsCarlos Martín Nieto2015-03-191-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | win32 resource: allow custom comments field in DLL
| * | | | | | win32 resource: allow custom comments field in DLLEdward Thomson2015-03-181-2/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2967 from jacquesg/merge-whitespaceEdward Thomson2015-03-1857-17/+261
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Allow merges of files (and trees) with whitespace problems/fixes
| * | | | | Added changelog entries for whitespace and patience merges.Jacques Germishuys2015-03-171-0/+12
| | | | | |
View Lorry Controller Status