summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* commit: allow retrieving an arbitrary header fieldcmn/commit-header-fieldCarlos Martín Nieto2015-06-221-0/+55
| | | | | | This allows the user to look up fields which we don't parse in libgit2, and allows them to access gpgsig or mergetag fields if they wish to check the signature.
* 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.)
* Merge pull request #3236 from libgit2/cmn/index-checksumEdward Thomson2015-06-204-14/+49
|\ | | | | 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-192-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-172-1/+2
|/
* Merge pull request #3219 from libgit2/cmn/racy-diffCarlos Martín Nieto2015-06-176-3/+86
|\ | | | | 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.
| * Introduce p_utimes and p_futimesEdward Thomson2015-06-164-1/+54
| | | | | | | | | | | | Provide functionality to set the time on a filesystem entry, using utimes or futimes on POSIX type systems or SetFileTime on Win32.
| * crlf: tick the index forward to work around racy-git behaviourCarlos Martín Nieto2015-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #3209 from libgit2/cmn/double-authorEdward Thomson2015-06-161-0/+10
|\ \ | | | | | | commit: ignore multiple author fields
| * | commit: ignore multiple author fieldscmn/double-authorCarlos Martín Nieto2015-06-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | 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-164-5/+4
|\ \ \ | |_|/ |/| | Fixed Xcode 6.1 build warnings
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-154-5/+4
| | |
* | | Merge pull request #3216 from dprofeta/fixTransactionVisibilityEdward Thomson2015-06-151-0/+1
|\ \ \ | |/ / |/| | Fix visibility of transaction symbol
| * | Fix visibility of transaction symbolDamien PROFETA2015-06-121-0/+1
| | | | | | | | | | | | | | | Transaction.c did not include the visibility definition of its symbol (that are in git2/transaction.h) and so was by default hidden.
* | | path: remove unnecessary readdir_r usagecmn/readdirCarlos Martín Nieto2015-06-152-5/+4
| | | | | | | | | | | | | | | | | | Arguably all uses of readdir_r are unnecessary, but in this case especially so, as the directory handle only exists within this function, so we don't race with anybody.
* | | Merge pull request #3171 from libgit2/cmn/link-fallbackCarlos Martín Nieto2015-06-151-2/+15
|\ \ \ | | | | | | | | clone: fall back to copying when linking does not work
| * | | clone: fall back to copying when linking does not workcmn/link-fallbackCarlos Martín Nieto2015-06-011-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use heuristics to make a decent guess at when we can save time and space by linking object files during a clone. Unfortunately checking the device id isn't enough, as those would be the same during e.g. a bind-mount, but the OS still does not allow us to link between mounts of the same filesystem. If we fail to perform the links, fall back to copying the contents into a new file as a last attempt.
* | | | Fix in stransport_stream.c for usage of SecCopyErrorMessageString(), which ↵Logan Collins2015-06-151-0/+5
| | | | | | | | | | | | | | | | is unavailable to iOS targets.
* | | | Merge pull request #3177 from ethomson/binary_diffCarlos Martín Nieto2015-06-157-209/+452
|\ \ \ \ | | | | | | | | | | Binary diffs: store deltas in the diff structure, include binary data in diff callbacks
| * | | | patch: include diff options on blob->blob diffsEdward Thomson2015-06-121-1/+2
| | | | |
| * | | | diff: introduce binary diff callbacksEdward Thomson2015-06-127-208/+450
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Introduce a new binary diff callback to provide the actual binary delta contents to callers. Create this data from the diff contents (instead of directly from the ODB) to support binary diffs including the workdir, not just things coming out of the ODB.
* | | | Merge pull request #3215 from jeffhostetler/windows_leak_diriterCarlos Martín Nieto2015-06-121-0/+2
|\ \ \ \ | |/ / / |/| | | Fix memory leak on windows in diriter.
| * | | Fix memory leak on windows in diriter.Jeff Hostetler2015-06-121-0/+2
| | | |
* | | | Fixed some Secure Transport issues on OS XPierre-Olivier Latour2015-06-111-20/+36
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | The read and write callbacks passed to SSLSetIOFuncs() have been rewritten to match the implementation used on opensource.apple.com and other open source projects like VLC. This change also fixes a bug where the read callback could get into an infinite loop when 0 bytes were read.
* | | Merge pull request #3205 from ethomson/crlf_queryCarlos Martín Nieto2015-06-111-1/+23
|\ \ \ | | | | | | | | Introduce `git_filter_list_contains`
| * | | Introduce `git_filter_list_contains`Edward Thomson2015-06-101-1/+23
| | | | | | | | | | | | | | | | | | | | `git_filter_list_contains` can be used to query a filter list to determine if a given filter will be run.
* | | | Merge pull request #3174 from libgit2/cmn/idx-fill-holeEdward Thomson2015-06-101-3/+4
|\ \ \ \ | | | | | | | | | | indexer: use lseek to extend the packfile
| * | | | indexer: use lseek to extend the packfilecmn/idx-fill-holeCarlos Martín Nieto2015-06-021-3/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've been using `p_ftruncate()` to extend the packfile in order to mmap it and write the new data into it. This works well in the general case, but as truncation does not allocate space in the filesystem, it must do so when we write data to it. The only way the OS has to indicate a failure to allocate space is via SIGBUS which means we tried to write outside the file. This will cause everyone to crash as they don't expect to handle this signal. Switch to using `p_lseek()` and `p_write()` to extend the file in a way which tells the filesystem to allocate the space for the missing data. We can then be sure that we have space to write into.
* | | | Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()Pierre-Olivier Latour2015-06-101-4/+4
| |/ / |/| | | | | | | | | | | git_diff_find_similar() now ignores git_diff_delta records with a status of GIT_DELTA_CONFLICTED, which fixes a crash due to assert() being hit.
* | | filter: close the descriptor in case of errorcmn/coverityCarlos Martín Nieto2015-06-101-2/+3
| | | | | | | | | | | | | | | | | | | | | When we hit an error writing to the next stream from a file, we jump to 'done' which currently skips over closing the file descriptor. Make sure to close the descriptor if it has been set to a valid value.
* | | object: correct the expected ID size in prefix lookupCarlos Martín Nieto2015-06-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We take in a possibly partial ID by taking a length and working off of that to figure out whether to just look up the object or ask the backends for a prefix lookup. Unfortunately we've been checking the size against `GIT_OID_HEXSZ` which is the size of a *string* containing a full ID, whereas we need to check against the size we can have when it's a 20-byte array. Change the checks and comment to use `GIT_OID_RAWSZ` which is the correct size of a git_oid to have when full.
* | | pack: use git_buf when building the index nameCarlos Martín Nieto2015-06-101-10/+11
| | | | | | | | | | | | | | | | | | The way we currently do it depends on the subtlety of strlen vs sizeof and the fact that .pack is one longer than .idx. Let's use a git_buf so we can express the manipulation we want much more clearly.
* | | merge: actually increment the counts, not the pointersCarlos Martín Nieto2015-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | `merge_diff_list_count_candidates()` takes pointers to the source and target counts, but when it comes time to increase them, we're increasing the pointer, rather than the value it's pointing to. Dereference the value to increase.
* | | cache: add a check for a failed allocationCarlos Martín Nieto2015-06-101-0/+1
| | | | | | | | | | | | Rather minimal change, but it's the kind of thing we should do.
* | | Merge pull request #3198 from libgit2/cmn/coverityEdward Thomson2015-06-095-10/+11
|\ \ \ | |_|/ |/| | A few fixes from Coverity
| * | Initialize a few variablesCarlos Martín Nieto2015-06-093-3/+3
| | | | | | | | | | | | | | | | | | Coverity complains about the git_rawobj ones because we use a loop in which we keep remembering the old version, and we end up copying our object as the base, so we want to have the data pointer be NULL.
| * | ssh: move NULL check to the free functionCarlos Martín Nieto2015-06-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Let `ssh_stream_free()` take a NULL stream, as free functions should, and remove the check from the connection setup. The connection setup would not need the check anyhow, as we always have a stream by the time we reach this code.
| * | remote: some error-handling issues from CoverityCarlos Martín Nieto2015-06-071-2/+3
| | |
* | | Merge pull request #3165 from ethomson/downcaseCarlos Martín Nieto2015-06-087-24/+33
|\ \ \ | | | | | | | | Downcase
| * | | git__tolower: a tolower() that isn't dumbEdward Thomson2015-05-297-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some brain damaged tolower() implementations appear to want to take the locale into account, and this may require taking some insanely aggressive lock on the locale and slowing down what should be the most trivial of trivial calls for people who just want to downcase ASCII.
| * | | git__strcasecmp: treat input bytes as unsignedEdward Thomson2015-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Treat input bytes as unsigned before doing arithmetic on them, lest we look at some non-ASCII byte (like a UTF-8 character) as a negative value and perform the comparison incorrectly.
* | | | global: Ensure we free our SSL context.Tim Hentenaar2015-06-081-0/+16
| | | |
* | | | Merge pull request #3185 from libgit2/cmn/foreach-cancel-looseCarlos Martín Nieto2015-06-071-2/+4
|\ \ \ \ | | | | | | | | | | path: error out if the callback returns an error
| * | | | path: error out if the callback returns an errorcmn/foreach-cancel-looseCarlos Martín Nieto2015-06-061-2/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | When the callback returns an error, we should stop immediately. This broke when trying to make sure we pass specific errors up the chain. This broke cancelling out of the loose backend's foreach.
* | | | Merge pull request #3175 from git-up/build_warningsCarlos Martín Nieto2015-06-072-1/+7
|\ \ \ \ | |/ / / |/| | | Fixed build warnings on Xcode 6.1
| * | | Fixed build warnings on Xcode 6.1Pierre-Olivier Latour2015-06-022-1/+7
| | |/ | |/|