| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
| |
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.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | | |
|
| |\ \
| | |
| | | |
Downcase
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| |/ / / |
|
| |\ \ \
| | | |
| | | | |
path: error out if the callback returns an error
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
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.
|
| |\ \ \
| | | |
| | | | |
Fixed build warnings on Xcode 6.1
|
| | | | | |
|
| |\ \ \ \
| |_|/ /
|/| | | |
print_usage functions is defined but not used
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
Use the previously created function to display a message when the arguments are not valid.
ticket 3095
|
| |\ \ \
| |/ /
|/| | |
Change error when running out of ssh agent keys
|
| |/ / |
|
| | |
| |
| |
| | |
This was forgotten when the feature was implemented.
|
| |\ \
| | |
| | | |
build maint branches on appveyor
|
| | | |
| | |
| | | |
equivalent of ca183d27366ba75597a9806b746e42a074df7795
|
| |\ \ \
| | | |
| | | | |
Implementation of url.*.insteadOf
|
| | | | | |
|
| | | | | |
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A remote's URLs are now modified according to the url.*.insteadOf
and url.*.pushInsteadOf configurations. This allows a user to
replace URL prefixes by setting the corresponding keys. E.g.
"url.foo.insteadOf = bar" would replace the prefix "bar" with the
new prefix "foo".
|
| | | | |
|
| |\ \ \
| | | |
| | | | |
Support getting SSH keys from memory, pt. 2
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The public key field is optional and as such can take NULL. Account for
that and do not call strlen() on NULL values. Also assert() for non-NULL
values of username & private key.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Declare GIT_CREDTYPE_SSH_MEMORY to have consistent API independently of
whether libgit2 was built with or without in-memory key passing support.
Or rather, to have it at all since build-time definitions are not stored
in headers.
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | | |
To not modify the external api.
|
| | |/ / |
|
| |\ \ \
| | | |
| | | | |
Rename GIT_EMERGECONFLICT to GIT_ECONFLICT
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We do not error on "merge conflicts"; on the contrary, merge conflicts
are a normal part of merging. We only error on "checkout conflicts",
where a change exists in the index or the working directory that would
otherwise be overwritten by performing the checkout.
This *may* happen during merge (after the production of the new index
that we're going to checkout) but it could happen during any checkout.
|
| |\ \ \ \
| |/ / /
|/| | | |
Changed README to use new OCaml bindings to git
|
| |/ / / |
|
| |\ \ \
| | | |
| | | | |
Include conflicts when diffing
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If there exists a conflict in the index, but no file in the working
directory, this implies that the user wants to accept the resolution
by removing the file. Thus, remove the conflict entry from the
index, instead of trying to add a (nonexistent) file.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Mark the `old_file` and `new_file` sides of a delta with a new bit,
`GIT_DIFF_FLAG_EXISTS`, that introduces that a particular side of
the delta exists in the diff.
This is useful for indicating whether a working directory item exists
or not, in the presence of a conflict. Diff users may have previously
used DELETED to determine this information.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When confronted with a conflict in the index, `git_index_add_all`
should stage the working directory copy. If there is no file in the
working directory, the conflict should simply be removed.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
cl_git_sandbox_init_new() will create a clar temp directory and
initialize a new repository at that location.
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It's not always obvious the mapping between stage level and
conflict-ness. More importantly, this can lead otherwise sane
people to write constructs like `if (!git_index_entry_stage(entry))`,
which (while technically correct) is unreadable.
Provide a nice method to help avoid such messy thinking.
|
| | | | | |
|
