summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add a SecureTransport TLS channelCarlos Martín Nieto2015-04-239-6/+283
|/ / / | | | | | | | | | | | | As an alternative to OpenSSL when we're on OS X. This one can actually take advantage of stacking the streams.
* | | Merge pull request #3064 from rcorre/config-write-fixCarlos Martín Nieto2015-04-232-1/+42
|\ \ \ | | | | | | | | config_write -- handle duplicate section headers when deleting entries
| * | | git_config_delete: search until last section.Ryan Roden-Corrent2015-04-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If git_config_delete is to work properly in the presence of duplicate section headers, it cannot stop searching at the end of the first matching section, as there may be another matching section later. When config_write is used for deletion (value = NULL), it may only terminate when the desired key is found or there are no sections left to parse.
| * | | Specify mock config file content in test.Ryan Roden-Corrent2015-04-212-10/+11
| | | | | | | | | | | | | | | | | | | | Instead of using a config file in resources, include the config file content to be tested directly in the test.
| * | | Unittest to validate config entry deletion bug.Ryan Roden-Corrent2015-04-212-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | Add a unittest to validate bug #3043, where a duplicate empty config header could cause deletion of a config entry to fail silently. The bug is currently unresolved and this test will fail.
* | | | Merge branch 'attr-ignore'Carlos Martín Nieto2015-04-232-1/+26
|\ \ \ \
| * | | | attr_file: fix subdirectory attr case.Mike McQuaid2015-04-231-1/+8
| | | | | | | | | | | | | | | | | | | | Closes #2966.
| * | | | Add failing subdirectory gitignore attr test.Mike McQuaid2015-04-231-0/+18
| | | | |
* | | | | Merge pull request #3032 from jfultz/index-file-modesEdward Thomson2015-04-233-9/+117
|\ \ \ \ \ | | | | | | | | | | | | Fix git_checkout_tree() to do index filemodes correctly on Windows.
| * | | | | Fix index-adding functions to know when to trust filemodes.John Fultz2015-04-213-17/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea...sometimes, a filemode is user-specified via an explicit git_index_entry. In this case, believe the user, always. Sometimes, it is instead built up by statting the file system. In those cases, go with the existing logic we have to determine whether the file system supports all filemodes and symlinks, and make the best guess. On file systems which have full filemode and symlink support, this commit should make no difference. On others (most notably Windows), this will fix problems things like: * git_index_add and git_index_add_frombuffer() should be believed. * As a consequence, git_checkout_tree should make the filemodes in the index match the ones in the tree. * And diffs with GIT_DIFF_UPDATE_INDEX don't write the wrong filemodes. * And merges, and probably other downstream stuff now fixed, too. This makes my previous changes to checkout.c unnecessary, so they are now reverted. Also, added a test for index_entry permissions from git_index_add and git_index_add_frombuffer, both of which failed before these changes.
| * | | | | Oops...need bitwise, not logical negation.John Fultz2015-04-161-2/+2
| | | | | |
| * | | | | Fix git_checkout_tree() to do index filemodes correctly on Windows.John Fultz2015-04-062-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_checkout_tree() has some fallback behaviors for file systems which don't have full support of filemodes. Generally works fine, but if a given file had a change of type from a 0644 to 0755 (i.e., you add executable permissions), the fallback behavior incorrectly triggers when writing hte updated index. This would cause a git_checkout_tree() command, even with the GIT_CHECKOUT_FORCE option set, to leave a dirty index on Windows. Also added checks to an existing test to catch this case.
* | | | | | Merge pull request #3065 from cthomas/masterCarlos Martín Nieto2015-04-222-51/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix for Issue #3023 tests fail with no network
| * | | | | | Fix for Issue #3023 tests fail with no networkcthomas2015-04-212-51/+52
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved offending tests from network to online so they will get skipped when there is a lack of network connectivity: -test_online_remotes__single_branch -test_online_remotes__restricted_refspecs
* | | | | | Merge pull request #3051 from ↵Edward Thomson2015-04-213-11/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | jeffhostetler/jeffhostetler/memleak_windows_tls_data Attempt to fix Windows TLS memory leak.
| * | | | | Rename routine to free TLS dataJeff Hostetler2015-04-183-4/+9
| | | | | |
| * | | | | Remove DllMain now that TLS data freed by threadsJeff Hostetler2015-04-171-8/+0
| | | | | |
| * | | | | Also fix leak of TLS data on main thread.Jeff Hostetler2015-04-171-4/+1
| | | | | |
| * | | | | Attempt to fix Windows TLS memory leak.Jeff Hostetler2015-04-173-5/+17
| | | | | |
* | | | | | Merge pull request #2992 from ethomson/rebase_fixesCarlos Martín Nieto2015-04-218-196/+311
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rebase fixes
| * | | | | | rebase: correct documentation, CHANGELOGEdward Thomson2015-04-202-9/+9
| | | | | | |
| * | | | | | rebase: include checkout opts within rebase optsEdward Thomson2015-04-203-17/+11
| | | | | | |
| * | | | | | rebase: test checkout options for rebaseEdward Thomson2015-04-201-0/+49
| | | | | | |
| * | | | | | rebase: init and open take a rebase_optionsEdward Thomson2015-04-207-214/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.
| * | | | | | rebase: take `checkout_options` where appropriateEdward Thomson2015-04-206-39/+60
| | | | | | |
| * | | | | | reset: `git_checkout_options` is `const`Edward Thomson2015-04-202-5/+5
| | | | | | |
| * | | | | | rebase: block rebase_commit with unstaged changesEdward Thomson2015-04-203-20/+68
| | | | | | |
| * | | | | | rebase: commit should return GIT_EUNMERGEDEdward Thomson2015-04-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_rebase_commit should return `GIT_EUNMERGED` when unmerged items exist in the index, per the documentation. Test that this is correct.
| * | | | | | rebase: identify a rebase that has not startedEdward Thomson2015-04-204-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge pull request #3060 from ethomson/2851Carlos Martín Nieto2015-04-212-62/+93
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Handle invalid multiline configuration
| * | | | | | config_file: comment char can be invalid escapeEdward Thomson2015-04-202-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't assume that comment chars are comment chars, they may be (an attempt to be escaped). If so, \; is not a valid escape sequence, complain.
| * | | | | | config_file: parse multilines generouslyEdward Thomson2015-04-202-60/+72
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Combine unquoting and multiline detection to avoid ambiguity when parsing.
* | | | | | Merge pull request #3024 from git-up/diff_merge_fixEdward Thomson2015-04-191-2/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Make sure to also update delta->nfiles when merging diffs
| * | | | | Make sure to also update delta->nfiles when merging diffsPierre-Olivier Latour2015-03-301-2/+8
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #3016 from pks-t/ignore-exclude-fixEdward Thomson2015-04-172-5/+98
|\ \ \ \ \ | | | | | | | | | | | | ignore: fix negative ignores without wildcards.
| * | | | | ignore: fix negative ignores without wildcards.Patrick Steinhardt2015-04-172-5/+98
| | | | | |
* | | | | | Merge pull request #2999 from pks-t/submodule-set-urlEdward Thomson2015-04-173-5/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement git_submodule_set_branch.
| * | | | | | Implement git_submodule_set_branch.Patrick Steinhardt2015-04-123-5/+67
| | |_|_|_|/ | |/| | | |
* | | | | | 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 #3052 from ↵Edward Thomson2015-04-171-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | jeffhostetler/jeffhostetler/memleak_test_core_mkdir Fix memleak in test/core/mkdir reported by CRTDBG
| * | | | | | Fix memleak in test/core/mkdir reported by CRTDBGJeff Hostetler2015-04-171-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-163-8/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | Handle hide-then-push in the revwalk
| * | | | | | revwalk: reword the push textcmn/hide-then-pushCarlos Martín Nieto2015-04-131-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | 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.
| * | | | | | revwalk: add failing test for hiding and then pushing a commitCarlos Martín Nieto2015-04-081-0/+17
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 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.
View Lorry Controller Status