summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* submodule: remove the RESET enum valuescmn/submodule-config-stateCarlos Martín Nieto2015-06-222-9/+1
| | | | | These are not useful anymore, as we don't affect the instance's configuration.
* submodule: test unsetting config optionsCarlos Martín Nieto2015-06-221-13/+29
| | | | | | In addition to mapping enums to strings in the configuration, we need to know to delete the configuration option when given the "none" or "no" option.
* submodule: handle writing out all enum values for settingsCarlos Martín Nieto2015-06-222-65/+21
| | | | | | We currently do not handle those enum values which require us to set "true" or unset variables in all cases. Use a common function which does understand this by looking at our mapping directly.
* config: provide a function to reverse-lookup mapped cvarsCarlos Martín Nieto2015-06-222-0/+26
|
* examples: adjust to submodule status API changeCarlos Martín Nieto2015-06-221-16/+10
|
* submodule: test more accurately for non-existenceCarlos Martín Nieto2015-06-221-4/+4
| | | | | | The current code will always fail, but only because it's asking for a string on a live config. Take a snapshot and make sure we fail with ENOTFOUND instead of any old error.
* submodule: fix potential leak in the testsCarlos Martín Nieto2015-06-221-2/+1
|
* submodule: get rid of `_save()`Carlos Martín Nieto2015-06-223-61/+0
| | | | | We no longer have any setters which affect an instance, so `git_submodule_save()` is no longer relevant.
* submodule: make `_set_url()` affect the configurationCarlos Martín Nieto2015-06-224-61/+17
| | | | With this one, we can get rid of the edit_and_save test.
* submodule: make `_set_branch()` affect the configurationCarlos Martín Nieto2015-06-223-70/+53
|
* submodule: make `_set_update_fetch_recurse_submodules()` affect the configCarlos Martín Nieto2015-06-223-53/+49
| | | | | | Similarly to the other ones. In this test we copy over testing `RECURSE_YES` which shows an error in our handling of the `YES` variant which we may have to port to the rest.
* submodule: make `_set_update()` affect the configurationCarlos Martín Nieto2015-06-223-58/+47
| | | | | Moving on with the removal of runtime-changing variables, the update setting for a remote is whatever it was when it was looked up.
* submodule: correct detection of existing submodulesCarlos Martín Nieto2015-06-221-10/+26
| | | | | | | | | During the cache deletion, the check for whether we consider a submodule to exist got changed regarding submodules which are in the worktree but not configured. Instead of checking for the url field to be populated, check the location where we've found it.
* submodule: bring back finding by pathCarlos Martín Nieto2015-06-221-0/+42
| | | | | During the removal of the cache, we also removed the ability to use `_lookup()` to search by path rather than name. Bring this logic back.
* submodule: add an ignore option to statusCarlos Martín Nieto2015-06-2210-61/+50
| | | | | | | | | | | | | This lets us specify in the status call which ignore rules we want to use (optionally falling back to whatever the submodule has in its configuration). This removes one of the reasons for having `_set_ignore()` set the value in-memory. We re-use the `IGNORE_RESET` value for this as it is no longer relevant but has a similar purpose to `IGNORE_FALLBACK`. Similarly, we remove `IGNORE_DEFAULT` which does not have use outside of initializers and move that to fall back to the configuration as well.
* submodule: don't let status change an existing instanceCarlos Martín Nieto2015-06-226-24/+44
| | | | | | As submodules are becomes more like values, we should not let a status check to update its properties. Instead of taking a submodule, have status take a repo and submodule name.
* submodule: make set_ignore() affect the configurationCarlos Martín Nieto2015-06-225-56/+50
| | | | | Instead of affecting a particular instance, make it change the configuration.
* submodule: remove the per-repo cacheCarlos Martín Nieto2015-06-227-576/+270
| | | | | | | | | | | | | Having this cache and giving them out goes against our multithreading guarantees and it makes it impossible to use submodules in a multi-threaded environment, as any thread can ask for a refresh which may reallocate some string in the submodule struct which we've accessed in a different one via a getter. This makes the submodules behave more like remotes, where each object is created upon request and not shared except explicitly by the user. This means that some tests won't pass yet, as they assume they can affect the submodule objects in the cache and that will affect later operations.
* Merge pull request #3239 from git-up/stash_indexCarlos Martín Nieto2015-06-221-0/+2
|\ | | | | Write modified index in git_stash_apply()
| * Write modified index in git_stash_apply()Pierre-Olivier Latour2015-06-211-0/+2
|/ | | | | Same as with git_stash_save(), there's no reason not to write the index to disk since it has been modified.
* Merge pull request #3233 from ethomson/status_typechangeCarlos Martín Nieto2015-06-204-12/+64
|\ | | | | Don't propagate workdir's mode to the index during diff's update index
| * diff: preserve original mode in the indexEdward Thomson2015-06-203-12/+16
| | | | | | | | | | | | | | When updating the index during a diff, preserve the original mode, which prevents us from dropping the mode to what we have interpreted as on our system (eg, what the working directory claims it to be, which may be a lie on some systems.)
| * status: test that symlinks don't lose their modeEdward Thomson2015-06-201-0/+48
|/ | | | | | Test to ensure that when status updates an index, it does not alter the original mode for file types that are not supported (eg, symlinks on Windows).
* Merge pull request #3238 from git-up/double_freeEdward Thomson2015-06-201-2/+0
|\ | | | | Fixed index being double-freed in stash tests
| * Fixed index being double-freed in stash testsPierre-Olivier Latour2015-06-201-2/+0
| |
* | Merge pull request #3236 from libgit2/cmn/index-checksumEdward Thomson2015-06-206-16/+63
|\ \ | |/ |/| Use the checksum to check whether an index has been modified
| * index: make relative comparison use the checksum as wellcmn/index-checksumCarlos Martín Nieto2015-06-204-9/+6
| | | | | | | | | | | | This is used by the submodule in order to figure out if the index has changed since it last read it. Using a timestamp is racy, so let's make it use the checksum, just like we now do for reloading the index itself.
| * index: use the checksum to check whether it's been modifiedCarlos Martín Nieto2015-06-193-5/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | We currently use a timetamp to check whether an index file has been modified since we last read it, but this is racy. If two updates happen in the same second and we read after the first one, we won't detect the second one. Instead read the SHA-1 checksum of the file, which are its last 20 bytes which gives us a sure-fire way to detect whether the file has changed since we last read it. As we're now keeping track of it, expose an accessor to this data.
| * index: user a better assertion when comparing sizesCarlos Martín Nieto2015-06-191-2/+2
| | | | | | | | | | This will tell us which numbers we were trying to compare, rather than just telling us that they're different.
* | Merge pull request #3232 from Therzok/patch-2Carlos Martín Nieto2015-06-201-1/+1
|\ \ | | | | | | Quote LIBSSH2_LIBRARIES call
| * | Quote LIBSSH2_LIBRARIES callMarius Ungureanu2015-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Credits to @directhex It is possible for PKG_CHECK_MODULES(LIBSSH2 libssh2) to LIBSSH2_LIBRARIES to a string with more than one library in it - e.g. if your libssh2 was built against libgcrypt, it will be "ssh2;gcrypt" Quoting the string is needed, or CHECK_LIBRARY_EXISTS will fail.
* | | tests: tick over five seconds instead of oneCarlos Martín Nieto2015-06-201-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | When ticking over one second, it can happen that the actual time ticks over the same second between the time that we undermine our own race protections and the time in which we perform the index update. Such timing would make the time in the entries match the index' timestamp and we have not gained anything. Ticking over five seconds makes it so that if real-time rolls over that second, our index is still ahead. This is still suboptimal as we're dealing with timing, but five seconds should be long enough for any reasonable test runner to finish the tests.
* | Merge pull request #3229 from git-up/build_warningsCarlos Martín Nieto2015-06-173-2/+2
|\ \ | | | | | | Fixed Xcode 6.1 build warnings
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-173-2/+2
|/ /
* | Merge pull request #3227 from jeffhostetler/memory_leak__tests_network_refspecsCarlos Martín Nieto2015-06-171-0/+2
|\ \ | |/ |/| Fix memory leak in tests/network/refspecs.c
| * Fix memory leak in tests/network/refspecs.cJeff Hostetler2015-06-171-0/+2
|/
* Merge pull request #3219 from libgit2/cmn/racy-diffCarlos Martín Nieto2015-06-1714-7/+229
|\ | | | | Zero out racily-clean entries' file_size
| * checkout: allow workdir to contain checkout targetethomson/racy-diffcmn/racy-diffEdward Thomson2015-06-161-3/+14
| | | | | | | | | | | | When checking out some file 'foo' that has been modified in the working directory, allow the checkout to proceed (do not conflict) if 'foo' is identical to the target of the checkout.
| * merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson2015-06-161-0/+12
| |
| * Introduce p_utimes and p_futimesEdward Thomson2015-06-166-6/+110
| | | | | | | | | | | | Provide functionality to set the time on a filesystem entry, using utimes or futimes on POSIX type systems or SetFileTime on Win32.
| * tests: tick the index when we count OID calculationsCarlos Martín Nieto2015-06-165-19/+34
| | | | | | | | | | | | | | | | | | These tests want to test that we don't recalculate entries which match the index already. This is however something we force when truncating racily-clean entries. Tick the index forward as we know that we don't perform the modifications which the racily-clean code is trying to avoid.
| * crlf: tick the index forward to work around racy-git behaviourCarlos Martín Nieto2015-06-162-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | In order to avoid racy-git, we zero out the file size for entries with the same timestamp as the index (or during the initial checkout). This is the case in a couple of crlf tests, as the code is fast enough to do everything in the same second. As we know that we do not perform the modification just after writing out the index, which is what this is designed to work around, tick the mtime of the index file such that it doesn't agree with the files anymore, and we do not zero out these entries.
| * index: zero the size of racily-clean entriesCarlos Martín Nieto2015-06-161-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file entry has the same timestamp as the index itself, it is considered racily-clean, as it may have been modified after the index was written, but during the same second. We take extra steps to check the contents, but this is just one part of avoiding races. For files which do have changes but have not been updated in the index, updating the on-disk index means updating its timestamp, which means we would no longer recognise these entries as racy and we would trust the timestamp to tell us whether they have changed. In order to work around this, git zeroes out the file-size field in entries with the same timestamp as the index in order to force the next diff to check the contents. Do so in libgit2 as well.
| * diff: add failing test for racy-git in the indexCarlos Martín Nieto2015-06-161-0/+39
| | | | | | | | | | | | | | | | | | | | | | We update the index and then immediately change the contents of the file. This makes the diff think there are no changes, as the timestamp of the file agrees with the cached data. This is however a bug, as the file has obviously changed contents. The test is a bit fragile, as it assumes that the index writing and the following modification of the file happen in the same second, but it's enough to show the issue.
* | Merge pull request #3209 from libgit2/cmn/double-authorEdward Thomson2015-06-162-0/+17
|\ \ | | | | | | commit: ignore multiple author fields
| * | commit: ignore multiple author fieldscmn/double-authorCarlos Martín Nieto2015-06-112-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tools create multiple author fields. git is rather lax when parsing them, although fsck does complain about them. This means that they exist in the wild. As it's not too taxing to check for them, and there shouldn't be a noticeable slowdown when dealing with correct commits, add logic to skip over these extra fields when parsing the commit.
* | | Merge pull request #3225 from libgit2/cmn/url-emptyEdward Thomson2015-06-161-2/+6
|\ \ \ | | | | | | | | remote: return EINVALIDSPEC when given an empty URL
| * | | remote: return EINVALIDSPEC when given an empty URLcmn/url-emptyCarlos Martín Nieto2015-06-161-2/+6
|/ / / | | | | | | | | | | | | | | | This is what we used to return in the settter and there's tests in bindings which ask for this. There's no particular reason to stop doing so.
* | | Merge pull request #3221 from git-up/build_warningsCarlos Martín Nieto2015-06-167-17/+24
|\ \ \ | |_|/ |/| | Fixed Xcode 6.1 build warnings
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-157-17/+24
| | |