summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #2999 from pks-t/submodule-set-urlEdward Thomson2015-04-171-2/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement git_submodule_set_branch.
| * | | | | | Implement git_submodule_set_branch.Patrick Steinhardt2015-04-121-2/+26
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #3047 from git-up/diff_fixesEdward Thomson2015-04-171-10/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Diff fixes
| * | | | | Fixed GIT_DIFF_UPDATE_INDEX not being aware of executable bit changesPierre-Olivier Latour2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the prior implementation, enabling GIT_DIFF_UPDATE_INDEX would overwrite entries in the index with the ones generated from scanning the working if the OID was the same. Because this OID comparison ignores file modes, this means an file in the workdir with only an exec bit difference with the one in the index would end up being overwritten, resulting in the exec bit being loss. There might be other related bugs but the fix of comparing OIDs and file modes should address them all.
| * | | | | Removed unnecessary conditionPierre-Olivier Latour2015-04-151-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | The variable noid is guaranteed to be zero at this point of the code path.
| * | | | | Use git_oid_cpy() instead of memcpy()Pierre-Olivier Latour2015-04-151-1/+1
| | | | | |
* | | | | | Merge pull request #3042 from libgit2/cmn/odd-slowdownEdward Thomson2015-04-161-2/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | revwalk: detect when we're out of interesting commits
| * | | | | | 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 #3037 from libgit2/cmn/hide-then-pushEdward Thomson2015-04-161-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Handle hide-then-push in the revwalk
| * | | | | | revwalk: don't insert uninteresting commits into the queueCarlos Martín Nieto2015-04-081-0/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a commit is first set as unintersting and then pushed, we must take care that we do not put it into the commit list as that makes us return at least that commit (but maybe more) as we've inserted it into the list because we have the assumption that we want anything in the commit list.
* | | | | | Merge pull request #3039 from jeffhostetler/jeffhostetler/msvc_crtdbgEdward Thomson2015-04-161-0/+117
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add memory leak detection/reporting using MSVC CRTDBG facility.
| * | | | | Add MSVC CRTDBG memory leak reporting.Jeff Hostetler2015-04-151-0/+117
| |/ / / /
* | | | | Merge pull request #2974 from libgit2/cmn/clone-everythingEdward Thomson2015-04-103-3/+40
|\ \ \ \ \ | | | | | | | | | | | | 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-171-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #3030 from linquize/symlink_supportedEdward Thomson2015-04-101-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | If work_dir is not specified, use repo_dir to test if symlink is supported
| * | | | | | 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.
* | | | | | Fix checking of return value for regcomp.Patrick Steinhardt2015-04-103-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | describe: only abort without tags if fallback is not allowed.Patrick Steinhardt2015-04-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Entry argument passed to git_index_add_frombuffer() should be constPierre-Olivier Latour2015-04-031-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #3011 from ethomson/filter_zero_tempbufEdward Thomson2015-03-251-0/+3
|\ \ \ \ | | | | | | | | | | 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.
* | | | | squash some leaksEdward Thomson2015-03-242-5/+5
| | | | |
* | | | | Merge pull request #2990 from leoyanggit/custom_paramEdward Thomson2015-03-246-8/+18
|\ \ \ \ \ | | | | | | | | | | | | Add a custom param to git_smart_subtransport_definition
| * | | | | Add a custom param to git_smart_subtransport_definitionLeo Yang2015-03-186-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-22/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | WinHTTP for MinGW
| * | | | | | Use swprintf_s everywhere except mingw.orgTony Kelman2015-03-191-3/+7
| | | | | | |
| * | | | | | Fix build on mingw-w64Alex Crichton2015-03-161-2/+2
| | | | | | |
| * | | | | | Win32: Enable WinHTTP for MinGWPhilip Kelley2015-03-161-23/+24
| | | | | | |
* | | | | | | Merge pull request #2947 from libgit2/cmn/notes-bufEdward Thomson2015-03-241-21/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 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-171-21/+40
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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.
* | | | | | 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-182-6/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Allow merges of files (and trees) with whitespace problems/fixes
| * | | | | Added options to enable patience and minimal diff driversJacques Germishuys2015-03-161-0/+6
| | | | | |
| * | | | | Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-162-8/+8
| | | | | |
| * | | | | Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
| | | | | |
| * | | | | Allow for merges with whitespace discrepanciesJacques Germishuys2015-03-162-4/+15
| | |_|/ / | |/| | |
* | | | | Merge pull request #2955 from git-up/update_tips_fixesCarlos Martín Nieto2015-03-182-13/+18
|\ \ \ \ \ | | | | | | | | | | | | Update tips fixes
| * | | | | Fixed active refspecs not reset by git_remote_upload()Pierre-Olivier Latour2015-03-111-0/+4
| | | | | |
| * | | | | Fixed update_tips callback called for failed pushed referencesPierre-Olivier Latour2015-03-111-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation does not set 'fire_callback' back to 0 for failed updates so the callback still fires. Instead of adding yet another condition check to set 'fire_callback' to 0 if needed, considering this function should be a no-op for failed updates anyway, the best fix is to simplify its logic to check upfront if the update is a failed one.
* | | | | | Merge remote-tracking branch 'ethomson/submodule_8dot3'Carlos Martín Nieto2015-03-183-61/+167
|\ \ \ \ \ \
| * | | | | | repository: Introduce "reserved names"Edward Thomson2015-02-273-61/+166
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A repository can have multiple "reserved names" now, not just a single "short name" for the repository folder itself. Refactor to include a git_repository__reserved_names that returns all the reserved names for a repository.
View Lorry Controller Status