| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
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.
|
| | |
|
| |
|
|
|
|
| |
Provide functionality to set the time on a filesystem entry,
using utimes or futimes on POSIX type systems or SetFileTime
on Win32.
|
| |
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
| |
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.
|
| |\
| |
| | |
Fix visibility of transaction symbol
|
| | |
| |
| |
| |
| | |
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 usage
|
| |/ /
| |
| |
| |
| |
| | |
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.
|
| |\ \
| | |
| | | |
clone: fall back to copying when linking does not work
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | | |
is unavailable to iOS targets.
|
| |\ \ \
| | | |
| | | | |
Binary diffs: store deltas in the diff structure, include binary data in diff callbacks
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | |/
| |/| |
|
| |\ \ \
| | | |
| | | | |
Fix leaks in tests/checkout/icase
|
| | | | | |
|
| |\ \ \ \
| |_|/ /
|/| | | |
Fix memory leak on windows in diriter.
|
| | |/ / |
|
| |\ \ \
| | | |
| | | | |
Fixed some Secure Transport issues on OS X
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| |\ \ \ \
| |/ / /
|/| | | |
travis: fail if we fail the push tests
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
We need to pass these options in order to have the credentials callback
set.
|
| |/ / /
| | |
| | |
| | |
| | |
| | | |
These tests were not being taken into consideration for the failure of
the test. They've been failing for a while now, but we hadn't noticed as
Travis was reporting the builds successful.
|
| |\ \ \
| | | |
| | | | |
cred_helpers: Add 'const' qualifiers to git_cred_userpass_payload
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make both username & password in git_cred_userpass_payload 'const'.
The values are not altered anywhere, and the extra qualifier allows
clients to assign 'const' values there.
|
| |\ \ \ \
| | | | |
| | | | | |
Introduce `git_filter_list_contains`
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
`git_filter_list_contains` can be used to query a filter list to
determine if a given filter will be run.
|
| |\ \ \ \ \
| | | | | |
| | | | | | |
Correct line endings on winhttp.def
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | | |
indexer: use lseek to extend the packfile
|
| | | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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()
|
| | | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | | |
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.
|
| |\ \ \ \ \
| |/ / / /
|/| | | | |
gitattributes: let clients use native line endings
|
| |/ / / /
| | | |
| | | |
| | | |
| | | | |
Use "text=auto" to ensure that we get LFs in the repository, but
let clients have their native line endings in their worktree.
|
| |\ \ \ \
| | | | |
| | | | | |
A few more fixes from coverity
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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_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.
|
| | | | |
| | | |
| | | |
| | | | |
Rather minimal change, but it's the kind of thing we should do.
|
| |\ \ \ \
| |_|_|/
|/| | | |
A few fixes from Coverity
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
