| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | |
|
| | |
| |
| |
| |
| |
| | |
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.
|
| |\ \
| | |
| | | |
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.
|
| |/ / |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| |\ \ \
| | | |
| | | | |
Include conflicts when diffing
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since a diff entry only concerns a single entry, zero the information
for the index side of a conflict. (The index entry would otherwise
erroneously include the lowest-stage index entry - generally the
ancestor of a conflict.)
Test that during status, the index side of the conflict is empty.
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When diffing against an index, return a new `GIT_DELTA_CONFLICTED`
delta type for items that are conflicted. For a single file path,
only one delta will be produced (despite the fact that there are
multiple entries in the index).
Index iterators now have the (optional) ability to return conflicts
in the index. Prior to this change, they would be omitted, and callers
(like diff) would omit conflicted index entries entirely.
|
| | | | | |
|
| | | |/
| |/|
| | |
| | |
| | |
| | | |
When adding a conflict for some path, remove the staged entry.
Otherwise, an illegal index (with both stage 0 and high-stage
entries) would result.
|
| |\ \ \
| | | |
| | | | |
Fill the pointers for matching refspecs
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When we look for which remote corresponds to a remote-tracking branch,
we look in the refspecs to see which ones matches. If none do, we should
abort. We currently ignore the error message from this operation, so
let's not do that anymore.
As part of the test we're writing, let's test for the expected behaviour
if we cannot find a refspec which tells us what the remote-tracking
branch for a remote would look like.
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
When we find out that we're dealing with a matching refspec, we set the
flag and return immediately. This leaves the strings as NULL, which
breaks the contract.
Assign these pointers to a string with the correct values.
|
| |\ \ \
| |_|/
|/| | |
Tackle remote API issues from bindings
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
When we moved from acting on the instance to acting on the
configuration, we dropped the validation of the passed refspec, which
can lead to writing an invalid refspec to the configuration. Bring that
validation back.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
An anonymous remote is not configured and cannot therefore have
configured refspecs. Remove the parameter which adds this from the
constructor.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The code used to rely on the clone code calling the remote's save, which
does not happen anymore, meaning that the configuration settings the
remote expected were not being written to disk.
The run-time configuration was still being affected, so the right branch
was being cloned. The tests continued to pass as we did not check for
the configuration entires. Fix this by creating the remote with the
single-branch refspec we want and checking for its existence in the
configuration.
|
| | |/
|/|
| |
| |
| | |
Git inserts a space after the SHA1 (as of 2.1.4 at least), so do the
same.
|
| |\ \
| | |
| | | |
index_add_all: include untracked files in new subdirs
|
| | | | |
|
| |/ /
| |
| |
| |
| |
| | |
When we discover that we want to keep a negative rule, make sure to
clear the error variable, as it we otherwise return whatever was left by
the previous loop iteration.
|
| |\ \
| |/
|/| |
Use a diff for iteration in index_update_all and index_add_all
|
| | |
| |
| |
| | |
Without this option, we would not be able to catch exec bit changes.
|
| |/
|
|
|
| |
The functionality was meged without including tests, so let's add them
now.
|
| |\
| |
| | |
Attributes: don't match files for folders
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| | |
When a .gitignore specifies some folder "foo/", ensure that a file
with the same name "foo" is not ignored.
|
| | |
| |
| |
| |
| |
| | |
Ensure that when examining a .gitignore in a subdirectory, we do not
erroneously apply the paths contained therein to the root of the
repository. (Fixed in c02a0e4).
|
| |\ \
| | |
| | | |
Use the packbuilder in local push
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A couple of tests use the wrong remote to push to. We did not notice up
to now because the local push would copy individual objects, and those
already existed, so it became a no-op.
Once we made local push create the packfile, it became noticeable that
there was a new packfile where it didn't belong.
|
| | | |
| | |
| | |
| | |
| | | |
The interesting one is the notification macro, which was returning
directly on a soft-abort instead of going through the cleanup.
|
| |\ \ \
| |/ /
|/| | |
submodule: add test initialising and cloning a repo
|
| | |/
| |
| |
| |
| |
| |
| |
| | |
We have a few tests checking each step, but we do not yet have a test
which tests the documented workflow for creating a submodule, namely
`setup_add` followed by cloning into it, followed by `add_finalize`.
Add such a test to protect against regressions in this workflow.
|
| | |
| |
| |
| |
| | |
It has now become a no-op, so remove the function and all references to
it.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The base refspecs changing can be a cause of confusion as to what is the
current base refspec set and complicate saving the remote's
configuration.
Change `git_remote_add_{fetch,push}()` to update the configuration
instead of an instance.
This finally makes `git_remote_save()` a no-op, it will be removed in a
later commit.
|
| | |
| |
| |
| |
| | |
This is another option which we should not be keeping in the remote, but
is specific to each particular operation.
|
| | |
| |
| |
| |
| |
| | |
While this will rarely be different from the default, having it in the
remote adds yet another setting it has to keep around and can affect its
behaviour. Move it to the options.
|
| | |
| |
| |
| |
| |
| |
| | |
Instead of having it set in a different place from every other callback,
put it the main structure. This removes some state from the remote and
makes it behave more like clone, where the constructors are passed via
the options.
|
