summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
* | remote: remove url and pushurl from the save logicCarlos Martín Nieto2015-05-133-12/+20
| | | | | | | | | | | | As a first step in removing the repository-saving logic, don't allow chaning the url or push url from a remote object, but change the configuration on the configuration immediately.
* | Remove the callbacks struct from the remoteCarlos Martín Nieto2015-05-1313-204/+140
|/ | | | | | | | | | | | | | Having the setting be different from calling its actions was not a great idea and made for the sake of the wrong convenience. Instead of that, accept either fetch options, push options or the callbacks when dealing with the remote. The fetch options are currently only the callbacks, but more options will be moved from setters and getters on the remote to the options. This does mean passing the same struct along the different functions but the typical use-case will only call git_remote_fetch() or git_remote_push() and so won't notice much difference.
* stash_apply: provide progress callbacksEdward Thomson2015-05-111-0/+45
|
* stash_apply: provide its own options structureEdward Thomson2015-05-112-17/+43
|
* stash: test checkout notify callbacksEdward Thomson2015-05-111-0/+52
|
* stash: return GIT_EMERGECONFLICT on merge conflictEdward Thomson2015-05-111-1/+1
|
* stash: refactor to use merge_iteratorsEdward Thomson2015-05-111-12/+12
|
* stash apply: check out a tree, not piecewiseEdward Thomson2015-05-111-2/+2
|
* index: introduce git_index_read_indexEdward Thomson2015-05-111-0/+73
|
* merge: merge iteratorsEdward Thomson2015-05-111-1/+13
|
* Added git_stash_apply() and git_stash_pop() APIsPierre-Olivier Latour2015-05-111-0/+215
|
* Merge pull request #3079 from ethomson/configCarlos Martín Nieto2015-05-041-0/+202
|\ | | | | Configuration changes for handling multiple of the same sections
| * config: test all multivars are updatedEdward Thomson2015-05-041-6/+16
| | | | | | | | | | | | If a multivar exists within two sections (of the same name) then they should both be updated in a `set_multivar`. Ensure that this is the case.
| * config: use wildcard in test instead of empty exprEdward Thomson2015-05-041-1/+1
| |
| * config: cleanup some now-unused variablesEdward Thomson2015-05-041-2/+0
| |
| * Test setting config var under duplicate header.Ryan Roden-Corrent2015-05-041-0/+49
| | | | | | | | | | | | | | | | | | | | Add a test that exposes a bug in config_write. It is valid to have multiple separate headers for the same config section, but config_write will exit after finding the first matching section in certain situations. This test proves that config_write will duplicate a variable that already exists instead of overwriting it if the variable is defined under a duplicate section header.
| * config: examine whole file when writingEdward Thomson2015-05-041-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we would try to be clever when writing the configuration file and try to stop parsing (and simply copy the rest of the old file) when we either found the value we were trying to write, or when we left the section that value was in, the assumption being that there was no more work to do. Regrettably, you can have another section with the same name later in the file, and we must cope with that gracefully, thus we read the whole file in order to write a new file. Now, writing a file looks even more than reading. Pull the config parsing out into its own function that can be used by both reading and writing the configuration.
| * config: test overwriting cvar in multiple regionsEdward Thomson2015-05-041-0/+36
| |
| * config: ensure we can write to an empty fileEdward Thomson2015-05-041-0/+72
| |
* | checkout test: better case-insensitive test on MacEdward Thomson2015-05-041-3/+29
| | | | | | | | | | | | | | | | On Mac OS, `realpath` is deficient in determining the actual filename on-disk as it will simply provide the string you gave it if that file exists, instead of returning the filename as it exists. Instead we must read the directory entries for the parent directory to get the canonical filename.
* | status test: always test the new file pathEdward Thomson2015-05-041-8/+12
| |
* | checkout test: only run icase on icase platformEdward Thomson2015-05-042-79/+61
| |
* | checkout: remove blocking dir when FORCEdEdward Thomson2015-05-041-7/+91
| |
* | Revert "Always checkout with case sensitive iterator"Edward Thomson2015-05-041-2/+13
| | | | | | | | This reverts commit 40d791545abfb3cb71553a27dc64129e1a9bec28.
* | checkout test: ensure we write to casechanged dirEdward Thomson2015-05-041-0/+57
| | | | | | | | | | | | Ensure that on a case insensitive filesystem that we can checkout into some folder 'FOLDER' that exists on disk, even if the target of the checkout is a different case (eg 'folder').
* | checkout test: ignore unstaged case-changing renamesEdward Thomson2015-05-041-0/+22
|/ | | | | | | | On Windows, you might sloppily rewrite a file (or have a sloppy text editor that does it for you) and accidentally change its case. (eg, "README" -> "readme"). Git ignores this accidental case changing rename during checkout and will happily write the new content to the file despite the name change. We should, too.
* Merge pull request #3087 from ethomson/pr/3054Carlos Martín Nieto2015-05-043-13/+54
|\ | | | | Performance Improvements to Status on Windows
| * git_path_diriter: next shouldn't take path ptrEdward Thomson2015-05-011-9/+50
| | | | | | | | | | | | | | | | The _next method shouldn't take a path pointer (and a path_len pointer) as 100% of current users use the full path and ignore the filename. Plus let's add some docs and a unit test.
| * git_path_dirload: use git_path_diriterEdward Thomson2015-05-011-1/+1
| |
| * Improvements to ignore performance on Windows.J Wyman2015-04-281-3/+3
| | | | | | | | Minimizing the number directory and file opens, minimizes the amount of IO thus reducing the overall cost of performing ignore operations.
* | Merge pull request #3059 from libgit2/cmn/negotiation-notifyEdward Thomson2015-05-011-1/+1
|\ \ | | | | | | [WIP/RFC] push: report the update plan to the caller
| * | push: report the update plan to the callercmn/negotiation-notifyCarlos Martín Nieto2015-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It can be useful for the caller to know which update commands will be sent to the server before the packfile is pushed up. git does this via the pre-push hook. We don't have hooks, but as it adds introspection into what is happening, we can add a callback which performs the same function.
* | | Fixed unused warning in tests/rebase/merge.cTomas Paladin Volf2015-04-301-0/+5
| |/ |/|
* | Merge pull request #3063 from ethomson/config_validate_nameCarlos Martín Nieto2015-04-242-0/+70
|\ \ | | | | | | Validate configuration keys
| * | config: ensure we can write to an empty fileEdward Thomson2015-04-231-0/+35
| | |
| * | config: test that we validate the keyEdward Thomson2015-04-231-0/+35
| | |
* | | Rename GIT_SSL to GIT_OPENSSLCarlos Martín Nieto2015-04-231-1/+1
| | | | | | | | | | | | | | | This is what it's meant all along, but now we actually have multiple implementations, it's clearer to use the name of the library.
* | | Add a SecureTransport TLS channelCarlos Martín Nieto2015-04-231-1/+1
|/ / | | | | | | | | 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-231-0/+38
|\ \ | | | | | | config_write -- handle duplicate section headers when deleting entries
| * | 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-231-0/+18
|\ \ \
| * | | Add failing subdirectory gitignore attr test.Mike McQuaid2015-04-231-0/+18
| | | |
* | | | Merge pull request #3032 from jfultz/index-file-modesEdward Thomson2015-04-232-2/+106
|\ \ \ \ | | | | | | | | | | Fix git_checkout_tree() to do index filemodes correctly on Windows.
| * | | | Fix index-adding functions to know when to trust filemodes.John Fultz2015-04-211-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Fix git_checkout_tree() to do index filemodes correctly on Windows.John Fultz2015-04-061-2/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | 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 #2992 from ethomson/rebase_fixesCarlos Martín Nieto2015-04-213-56/+116
|\ \ \ | | | | | | | | Rebase fixes
| * | | rebase: include checkout opts within rebase optsEdward Thomson2015-04-201-1/+2
| | | |
| * | | rebase: test checkout options for rebaseEdward Thomson2015-04-201-0/+49
| | | |
View Lorry Controller Status