summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* added failing repodiff-fails-with-cpp-fileBrendan Forster2015-03-3070-0/+3021
|
* added failing test against demo repositoryBrendan Forster2015-03-301-0/+31
|
* 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
| | | | | |
| * | | | | Added options to enable patience and minimal diff driversJacques Germishuys2015-03-162-0/+12
| | | | | |
| * | | | | Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-165-35/+23
| | | | | |
| * | | | | Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-166-12/+12
| | | | | |
| * | | | | Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-1649-0/+198
| | | | | |
| * | | | | Allow for merges with whitespace discrepanciesJacques Germishuys2015-03-163-4/+38
| | |_|/ / | |/| | |
* | | | | Merge pull request #2993 from ethomson/clar_updateCarlos Martín Nieto2015-03-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | clar: update to 08f434d
| * | | | | clar: update to 08f434dEdward Thomson2015-03-171-1/+1
| | |_|/ / | |/| | |
* | | | | 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-184-61/+275
|\ \ \ \ \ \
| * | | | | | repository: Introduce "reserved names"Edward Thomson2015-02-274-61/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge pull request #2985 from claudiuolteanu/patch-1Edward Thomson2015-03-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Lower case the include directive of windows header
| * | | | | | | Lower case the include directive of windows headerClaudiu Olteanu2015-03-161-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | Since the Linux platform has a case sensitive file system, the header name should be lower case for cross compiling purposes. (On Linux, the mingw header is called ```windows.h```).
* | | | | | | Merge pull request #2983 from ↵Edward Thomson2015-03-172-9/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jeffhostetler/jeffhostetler/perf_merge_lazy_binary_check PERF: In MERGE, lazily compute is_binary
| * | | | | | | PERF: In MERGE, lazily compute is_binaryJeff Hostetler2015-03-162-9/+19
| |/ / / / / /
* | | | | | | Merge pull request #2991 from ↵Edward Thomson2015-03-171-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | sba1/fix-uninitialized-data-access-remote-update-tips Initialize refs vector in git_remote_update_tips().
| * | | | | | Initialize refs vector in git_remote_update_tips().Sebastian Bauer2015-03-171-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, bailing out early when ls_to_vector() fails accesses uninitialized memory.
View Lorry Controller Status