Log

Author Commit Date CI Message
Edward Thomson 49b3ddf2 2015-03-17T17:45:31 rebase: commit should return GIT_EUNMERGED git_rebase_commit should return `GIT_EUNMERGED` when unmerged items exist in the index, per the documentation. Test that this is correct.
Edward Thomson 30640aa9 2015-03-17T10:04:08 rebase: identify a rebase that has not started In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.
Edward Thomson 08c45213 2015-04-19T19:58:03 Merge pull request #3024 from git-up/diff_merge_fix Make sure to also update delta->nfiles when merging diffs
Edward Thomson 4c02d393 2015-04-17T16:57:26 Merge pull request #3016 from pks-t/ignore-exclude-fix ignore: fix negative ignores without wildcards.
Edward Thomson a0e652d2 2015-04-17T12:35:41 Merge pull request #2999 from pks-t/submodule-set-url Implement git_submodule_set_branch.
Edward Thomson a5bf599c 2015-04-17T12:32:39 Merge pull request #3047 from git-up/diff_fixes Diff fixes
Edward Thomson c694f9fa 2015-04-17T10:53:46 Merge pull request #3052 from jeffhostetler/jeffhostetler/memleak_test_core_mkdir Fix memleak in test/core/mkdir reported by CRTDBG
Jeff Hostetler e3737a41 2015-04-17T10:30:33 Fix memleak in test/core/mkdir reported by CRTDBG
Patrick Steinhardt 4f358603 2015-03-24T16:33:50 ignore: fix negative ignores without wildcards.
Edward Thomson c332bb70 2015-04-16T19:26:40 Merge pull request #3042 from libgit2/cmn/odd-slowdown revwalk: detect when we're out of interesting commits
Edward Thomson 6f80bf4a 2015-04-16T19:12:28 Merge pull request #3037 from libgit2/cmn/hide-then-push Handle hide-then-push in the revwalk
Edward Thomson fa7281db 2015-04-16T18:26:47 Merge pull request #3039 from jeffhostetler/jeffhostetler/msvc_crtdbg Add memory leak detection/reporting using MSVC CRTDBG facility.
Pierre-Olivier Latour db853748 2015-04-15T15:28:03 Fixed GIT_DIFF_UPDATE_INDEX not being aware of executable bit changes 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.
Pierre-Olivier Latour cc93ad16 2015-04-15T15:27:59 Removed unnecessary condition The variable noid is guaranteed to be zero at this point of the code path.
Pierre-Olivier Latour 35df76bd 2015-04-15T15:27:56 Use git_oid_cpy() instead of memcpy()
Jeff Hostetler d06c589f 2015-04-10T06:15:06 Add MSVC CRTDBG memory leak reporting.
Carlos Martín Nieto a0541695 2015-04-14T03:26:45 revwalk: detect when we're out of interesting commits 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.
Carlos Martín Nieto 05d92026 2015-04-13T18:03:03 revwalk: reword the push text As it seems it's not quite clear what it means to push a commit, try to be more explicit about adding a new root and that we may not see this commit if it is hidden.
Patrick Steinhardt 129788a6 2015-03-18T11:45:18 Implement git_submodule_set_branch.
Edward Thomson 623fbd93 2015-04-10T11:38:07 Merge pull request #2974 from libgit2/cmn/clone-everything Make sure to pack referenced objects for non-branches
Edward Thomson 63af449e 2015-04-10T11:33:14 Merge pull request #3030 from linquize/symlink_supported If work_dir is not specified, use repo_dir to test if symlink is supported
Edward Thomson 8932c32c 2015-04-10T10:50:01 Merge branch 'pr/3035'
Edward Thomson eb1eb584 2015-04-10T10:32:42 Merge pull request #3038 from pks-t/fix-regcomp-retval-check Fix checking of return value for regcomp.
Patrick Steinhardt 129022ee 2015-04-10T09:36:38 Fix checking of return value for regcomp. 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.
Carlos Martín Nieto 50fdfe2b 2015-04-08T23:51:49 revwalk: don't insert uninteresting commits into the queue 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.
Carlos Martín Nieto 5a503fff 2015-04-08T23:42:36 revwalk: add failing test for hiding and then pushing a commit When we hide a commit which we later push into the revwalk, we do not handle this well and return commits which we should not.
Edward Thomson a01d3a0b 2015-04-08T16:32:28 Merge pull request #3033 from pks-t/describe-oid-fallback Fix describe without refs and OID fallbacks
Jozef Matula 2a069761 2015-04-08T16:30:44 ISO C90 forbids mixed declarations and code GIT_UNUSED() macro generates code therefore it should be used after variable declarations.
Patrick Steinhardt 08e1fd65 2015-04-07T14:44:08 describe: only abort without tags if fallback is not allowed. 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.
Patrick Steinhardt c843736d 2015-04-07T14:43:04 describe example: enable building by default.
Linquize 7c2a2172 2015-04-04T00:29:01 Test: Create repo in while current dir is readonly and checkout symlink
Linquize 466d2e7a 2015-04-03T19:01:20 For bare repository, use repo_dir to test if symlinks are supported
Edward Thomson 47f37400 2015-04-04T09:17:59 Merge pull request #3031 from git-up/git_index_add Entry argument passed to git_index_add_frombuffer() should be const
Pierre-Olivier Latour 807566d5 2015-04-03T18:59:11 Entry argument passed to git_index_add_frombuffer() should be const
Edward Thomson 92a8194c 2015-04-01T11:13:04 Merge pull request #3022 from ethomson/gitignore_vim gitignore: ignore vim swapfiles
Pierre-Olivier Latour b9780823 2015-03-30T14:06:21 Make sure to also update delta->nfiles when merging diffs When diffs are generated, the value for the 'nfiles' field of 'git_diff_delta' will be consistent with the value in the 'status' field. Merging diffs can modify the 'status' field of some deltas and the 'nfiles' field needs to be updated accordingly.
Edward Thomson bb3d6762 2015-03-30T09:33:02 gitignore: ignore vim swapfiles
Edward Thomson de355f23 2015-03-25T13:14:28 Merge pull request #3011 from ethomson/filter_zero_tempbuf Clear temporary buffer when filtering
Edward Thomson 669ae274 2015-03-23T13:12:55 filter: clear the temp_buf if we're using one 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.
Jacques Germishuys 7c2b9e06 2015-03-22T19:06:53 Illustrate bad checkout on Windows
Carlos Martín Nieto 585094cc 2015-03-25T02:22:42 Merge pull request #3017 from ethomson/leaks squash some leaks
Edward Thomson 78db0239 2015-03-24T20:58:00 squash some leaks
Edward Thomson c5e07187 2015-03-24T14:03:51 Merge pull request #2990 from leoyanggit/custom_param Add a custom param to git_smart_subtransport_definition
Edward Thomson aa7a4a50 2015-03-24T09:06:20 Merge pull request #2986 from tkelman/mingw_winhttp WinHTTP for MinGW
Edward Thomson 95d1624b 2015-03-24T08:34:12 Merge pull request #2947 from libgit2/cmn/notes-buf note: use a git_buf to return the default namespace
Carlos Martín Nieto 5dcd2d66 2015-03-24T10:37:12 Merge pull request #2858 from pks-t/remote-squashed examples: add remote example.
Carlos Martín Nieto 7c3834d1 2015-03-24T10:18:44 Merge pull request #3010 from ethomson/checkout_invalid_path_err checkout: report correct invalid path
Edward Thomson 3cda9cf2 2015-03-23T11:30:30 checkout: report correct invalid path
Carlos Martín Nieto 2a0f67f0 2015-03-21T21:48:03 git: make sure to close the network stream In case of a bad url or other error during the connection setup, we close the stream via free.
Edward Thomson a3f693e9 2015-03-20T16:57:32 Merge pull request #3003 from shawnl/master fix changelog
Shawn Landden b8c50808 2015-03-20T10:18:12 fix changelog
Edward Thomson 8311db0c 2015-03-19T15:10:58 Merge pull request #3000 from libgit2/vmg/mkdir-ext mkdir-ext: Assume directories don't exist; fix all race cases
Vicent Marti d88e6e9b 2015-03-19T18:38:13 mkdir-ext: Retry lstat on EEXIST race
Tony Kelman b631e0d9 2015-03-19T07:25:25 Use swprintf_s everywhere except mingw.org
Patrick Steinhardt 0a2f99fd 2015-01-26T15:36:34 examples: add remote example.
Carlos Martín Nieto 2c4e90f3 2015-03-19T01:03:41 Merge pull request #2996 from ethomson/dll_comments win32 resource: allow custom comments field in DLL
Edward Thomson 523526e5 2015-03-18T18:25:14 win32 resource: allow custom comments field in DLL
Edward Thomson 89ba9f1a 2015-03-18T13:17:04 Merge pull request #2967 from jacquesg/merge-whitespace Allow merges of files (and trees) with whitespace problems/fixes
Leo Yang 142e5379 2015-03-17T12:49:33 Add a custom param to git_smart_subtransport_definition The smart transport has already take the payload param. For the sub transport a payload param is useful for the implementer.
Carlos Martín Nieto 7568bdf4 2015-03-18T05:04:50 Merge pull request #2993 from ethomson/clar_update clar: update to 08f434d
Carlos Martín Nieto 03b51b5d 2015-03-18T05:04:12 Merge pull request #2955 from git-up/update_tips_fixes Update tips fixes
Carlos Martín Nieto 83ad46f7 2015-03-18T04:59:16 Merge remote-tracking branch 'ethomson/submodule_8dot3'
Edward Thomson 4c2e6b1e 2015-03-17T23:35:52 Merge pull request #2985 from claudiuolteanu/patch-1 Lower case the include directive of windows header
Edward Thomson fa8a38a4 2015-03-17T22:22:38 Merge pull request #2983 from jeffhostetler/jeffhostetler/perf_merge_lazy_binary_check PERF: In MERGE, lazily compute is_binary
Edward Thomson 08c29c44 2015-03-17T19:04:48 clar: update to 08f434d
Edward Thomson f0593a6b 2015-03-17T18:35:28 Merge pull request #2991 from sba1/fix-uninitialized-data-access-remote-update-tips Initialize refs vector in git_remote_update_tips().
Sebastian Bauer cdedef40 2015-03-17T21:38:58 Initialize refs vector in git_remote_update_tips(). Otherwise, bailing out early when ls_to_vector() fails accesses uninitialized memory.
Carlos Martín Nieto c84a9dd2 2015-03-12T01:52:15 local: recusrively insert non-branch objects into the packfile 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.
Carlos Martín Nieto 84511143 2015-03-12T01:49:07 tree: add more correct error messages for not found 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.
Carlos Martín Nieto a61fa4c0 2015-03-12T01:26:09 packbuilder: introduce git_packbuilder_insert_recur() 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.
Carlos Martín Nieto d23fb5c9 2015-03-12T01:09:13 clone: add failing test for local transport with a tag 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.
Carlos Martín Nieto 385449b1 2015-03-04T01:23:20 note: use a git_buf to return the default namespace The caller has otherwise no way to know how long the string will be allocated or ability to free it. This fixes #2944.
Tony Kelman 7aa96593 2015-03-17T12:05:07 set PKG_CONFIG_LIBDIR in toolchain-mingw32.cmake
Jacques Germishuys 70b0f128 2015-03-17T16:34:36 Added changelog entries for whitespace and patience merges.
Edward Thomson 9bbc8f35 2015-03-17T10:21:28 Merge pull request #2962 from libgit2/cmn/reflog-annotated Add annotated versions of ref-modying functions
Edward Thomson 7800048a 2015-03-17T10:06:50 Merge pull request #2972 from libgit2/cmn/pack-objects-walk [WIP] Smarter pack-building
Edward Thomson 828e5959 2015-03-17T09:44:56 Merge pull request #2982 from libgit2/cmn/stream-check-ec Don't ask for a stream's certificate unless it's encrypted
Edward Thomson c07d0206 2015-03-17T09:44:25 Merge pull request #2977 from pks-t/submodule-sync-url-fix Fix git_submodule_sync writing URL to wrong key.
Tony Kelman 547517d7 2015-03-16T14:49:23 use a different .def file for 64 bit
Claudiu Olteanu 118e6fdc 2015-03-16T23:08:16 Lower case the include directive of windows header 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```).
Tony Kelman d612e48e 2015-03-16T13:30:10 Fix out-of-tree build link against crypt32 for CertFreeCertificateContext
Alex Crichton 3066026b 2014-08-26T11:18:33 Fix build on mingw-w64
klutzy e613e6eb 2015-03-16T12:46:33 patch so mingw-w64 can build
Philip Kelley 8f426d7d 2014-06-09T11:43:25 Win32: Enable WinHTTP for MinGW
Jeff Hostetler fea24c53 2015-03-16T15:54:53 PERF: In MERGE, lazily compute is_binary
Carlos Martín Nieto 84d83b8e 2015-03-16T19:41:50 http: do not try to use the cert callback on unencrypted streams When the user has a certificate check callback set, we still have to check whether the stream we're using is even capable of providing a certificate. In the case of an unencrypted certificate, do not ask for it from the stream, and do not call the callback.
Carlos Martín Nieto 29e7ae5d 2015-03-16T19:39:05 Add failing test for cert callback with non-ecrypted stream When we have an HTTP stream and have set the certificatre check callback, we currently fail as we ask the unencrypted stream for its certificate.
Carlos Martín Nieto 8acf058f 2015-03-07T12:09:41 CHANGELOG: add notes about the annotated ref-modifying functions
Carlos Martín Nieto a5815a2a 2015-03-07T00:30:40 Add tests for the annotated versions of ref-modifying functions This also brings the soft-reset tests back to life. The function name was missing an underscore, meaning they had not been running.
Carlos Martín Nieto 62dd4d71 2015-03-07T00:06:02 annotated_commit: provide a constructor from a revspec This extra constructor will be useful for the annotated versions of ref-modifying functions, as it allows us to create a commit with the extended sha syntax which was used to retrieve it.
Carlos Martín Nieto 62d38a1d 2015-03-06T23:51:40 Add annotated commit versions of reflog-modifying functions We do not always want to put the id directly into the reflog, but we want to speicfy what a user typed. For this use-case we provide annotated version of a few functions which let the caller specify what user-friendly name was used when asking for the operation.
Jacques Germishuys 74c37c2a 2015-03-12T13:16:09 Added options to enable patience and minimal diff drivers
Jacques Germishuys 13de9363 2015-03-12T12:36:09 Collapse whitespace flags into git_merge_file_flags_t
Jacques Germishuys f29dde68 2015-03-12T12:29:47 Renamed git_merge_options 'flags' to 'tree_flags'
Jacques Germishuys 0f24cac2 2015-03-09T17:03:03 Added tests to merge files and branches with whitespace problems and fixes
Jacques Germishuys 45a86bbf 2015-03-09T17:02:52 Allow for merges with whitespace discrepancies
Carlos Martín Nieto d675982a 2015-03-15T00:24:36 Merge pull request #2975 from git-up/diff_index_retain Avoid retaining / releasing the index more than necessary when GIT_DIFF_...
Carlos Martín Nieto 7c63a33f 2015-03-13T19:41:40 indexer: bring back the error message on duplcate commits It turns out that erroring out on duplicate commits is the right thing to do, but git was not hitting the bug on the server-side. Bring back a descriptive error message in case of duplicate entries and error out.
Carlos Martín Nieto dccf59ad 2015-03-13T18:28:07 indexer: don't worry about duplicate objects If a packfile includes duplicate objects, we can choose to use the secon copy instead of the first by using the same logic as if it were the first. Change the error condition from 0 to -1, which indicates a bad resize, and set the OOM message in that case. This does mean we will leak the first copy of the object. We can deal with that later, but making fetches work is more important.
Carlos Martín Nieto a34692c4 2015-03-13T18:00:15 indexer: set an error message on duplicate objects in pack While this is not even close to a fix, we can at least set an error message so we know which error we are facing. Up to know we just returned an error without a message.