| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
Accessing the repository's config and immediately taking a snapshot of
it is a common operation, so let's provide a convenience function for
it.
|
| | |
|
| |
|
|
|
|
|
|
|
|
| |
With the isolation of complex reads, we can now try to refresh the
on-disk file before reading a value from it.
This changes the semantics a bit, as before we could be sure that a
string we got from the configuration was valid until we wrote or
refreshed. This is no longer the case, as a read can also invalidate the
pointer.
|
| |
|
|
|
|
|
|
|
|
|
| |
In order to have consistent views of the config files for remotes,
submodules et al. and a configuration that represents what is currently
stored on-disk, we need a way to provide a view of the configuration
that does not change.
The goal here is to provide the snapshotting part by creating a
read-only copy of the state of the configuration at a particular point
in time, which does not change when a repository's main config changes.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
I introduced a leak into conflict cleanup by removing items from
inside the git_vector_remove_matching call. This simplifies the
code to just use one common way for the two conflict cleanup APIs.
When an index has an active snapshot, removing an item can cause
an error (inserting into the deferred deletion vector), so I made
the git_index_conflict_cleanup API return an error code. I felt
like this wasn't so bad since it is just like the other APIs.
I fixed up a couple of comments while I was changing the header.
|
| |
|
|
|
|
|
| |
The usefulness of these helpers came up for me while debugging
some of the iterator changes that I was making, so since they
have also been requested (albeit indirectly) I thought I'd include
them.
|
| |
|
|
|
|
|
|
| |
Again, laying groundwork for some index iterator changes, this
contains a bunch of code refactorings for index internals that
should make it easier down the line to add locking around index
modifications. Also this removes the redundant prefix_position
function and fixes some potential memory leaks.
|
| |\
| |
| | |
Support for format-patch
|
| | | |
|
| | |
| |
| |
| | |
git_diff_stats_insertions, git_diff_stats_deletions and git_diff_stats_to_buf
|
| | |
| |
| |
| | |
git_patch_num_lines_in_hunk
|
| | |
| |
| |
| |
| |
| |
| |
| | |
git_branch_t is an enum so requesting GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE is not possible as it is not a member of the enum (at least VS2013 C++ complains about it).
This fixes a regression introduced in commit a667ca8298193b3103c1dbdcb1f6c527e6e99eb2 (PR #1946).
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
| |/ |
|
| | |
|
| |
|
| |
Per @carlosmn, git_index_add is now named git_index_add_bypath.
|
| | |
|
| |\
| |
| | |
In-memory packing backend
|
| | | |
|
| |\ \
| | |
| | | |
Rename in-memory remote to anonymous and swap url and fetch order
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The order in this function is the opposite to what
create_with_fetchspec() has, so change this one, as url-then-refspec is
what git does.
As we need to break compilation and the swap doesn't do that, let's take
this opportunity to rename in-memory remotes to anonymous as that's
really what sets them apart.
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
The reload_all call could end up dereferencing a NULL pointer if
there was an error while attempting to load the submodules config
data (i.e. invalid content in the gitmodules file). This fixes it.
|
| |\ \
| |/
|/| |
Make submodules externally refcounted
|
| | |
| |
| |
| |
| |
| |
| |
| | |
`git_submodule` objects were already refcounted internally in case
the submodule name was different from the path at which it was
stored. This makes that refcounting externally used as well, so
`git_submodule_lookup` and `git_submodule_add_setup` return an
object that requires a `git_submodule_free` when done.
|
| |\ \
| |/
|/| |
Callback function to hide commit and its parents in revision walker
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| |/
|/| |
Refactor the `git_merge` API
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| | |
The default cache size is 256 megabytes, not megabits as claimed in the
docs.
|
| |/
|
|
|
| |
This survived the last round of culling, as the signature is only in the
comments.
|
| |\
| |
| | |
Implement git_merge_base_octopus
|
| | | |
|
| |\ \
| |/
|/| |
Seamless support for NTLM/Kerberos auth on Windows
|
| | | |
|
| |/ |
|
| | |
|
| | |
|
| |\
| |
| | |
Rename options structures
|
| | | |
|
