| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This allows you to use a --repeat option to run status over and
over and see how the output changes as you make local directory
changes without reopening the git_repository object each time.
Also, adds a flag to explicitly list the submodules before status.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Turns out there was already a helper to do what I wanted to do,
so I just made it so that I could use it for sync and switched to
that instead.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes `git_submodule_sync` to correctly update the remote URL
of the default branch of the submodule along with the URL in the
parent repository config (i.e. match core Git's behavior).
Also move some useful helper logic from the submodule code into
a shared config API `git_config__update_entry` that can either set
or delete an entry with constraints like not overwriting or not
creating a new entry. I used that helper to update a couple other
places in the code.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There are a few places where we need to join three strings to
assemble a path. This adds a simple join3 function to avoid the
comparatively expensive join_n (which calls strlen on each string
twice).
|
|\ \ \
| |_|/
|/| | |
Retry committing locked files on error
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When a file is open for reading (without shared-delete permission), and
then a different thread/process called p_rename, that would fail, even
if the file was only open for reading for a few milliseconds. This
change lets p_rename wait up to 50ms for the file to be closed by the
reader. Applies only to win32.
This is especially important for git_filebuf_commit, because writes
should not fail if the file is read simultaneously.
Fixes #2207
|
|\ \ \
| | | |
| | | | |
Const correctness!
|
|/ / / |
|
|\ \ \
| | | |
| | | | |
Handle an upstream branch for an unborn one
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the current branch is unborn, git will still mark the current
branch's upstream for-merge if there is an upstream configuration. The
only non-constrived case is cloning from an empty repository which then
gains history. origin's master should be marked for-merge.
In order to do this, we cannot use the high-level wrappers that expect a
reference, as we may not have one. Move over to the internal ones that
expect a reference name, which we do have.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Cloning from an empty repo must set master's upstream to origin's
master, even if neither of them exist.
Fetching from a non-empty origin must then mark the master branch
for-merge. This currently fails.
|
|\ \ \ \
| |/ / /
|/| | | |
Skip tests on Clar
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
One blame test replies on being run from within the libgit2
repository to leverage having a longer history to play with, but
some bundled versions of libgit2 don't have the whole libgit2
history. This just skips that test if the repository can't be
opened.
|
|\ \ \ \
| | | | |
| | | | | |
Fix submodule_is_config_only's return value
|
| | | | | |
|
|\ \ \ \ \
| |/ / / /
|/| | | | |
No need to find merge base.
|
| | | | | |
|
|\ \ \ \ \
| | | | | |
| | | | | | |
Correct a stale reference to GIT_EBAREINDEX
|
| | | | | |
| | | | | |
| | | | | | |
Per @carlosmn, git_index_add is now named git_index_add_bypath.
|
| | |/ / /
| |/| | | |
|
|\ \ \ \ \
| |/ / / /
|/| | | | |
Skip untracked contained repo contents even with gitlink files
|
| | | | | |
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When doing a diff for use in status, we should never show the
content of a git repository contained inside another one. The
logic to do this was looking for a .git directory and so when a
gitlink plain .git file was used, it was failing to exclude the
directory content.
|
| |_|/
|/| | |
|
|\ \ \
| | | |
| | | | |
In-memory packing backend
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | | |
Fix submodule sort order during iteration
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
With the changes to how git_path_dirload_with_stat handles things
that look like submodules, submodules could end up sorted in the
wrong order with the workdir iterator. This moves the submodule
check earlier in the iterator processing of a new directory so
that the submodule name updates will happen immediately and the
sort order will be correct.
|
| | |/ /
| |/| | |
|
|\ \ \ \
| | | | |
| | | | | |
Add CFLAGS -Wdeclaration-after-statement
|
|/ / / /
| | | |
| | | |
| | | | |
This warns local variables declarations after statement, which helps not to break MSVC
|
|\ \ \ \
| | | | |
| | | | | |
Use git_object_short_id in examples
|
| | | | | |
|
|\ \ \ \ \
| |/ / / /
|/| | | | |
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.
|
|\ \ \ \
| |_|/ /
|/| | | |
Fix git_odb_short_id and git_odb_exists_prefix bugs
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The git_odb_exists_prefix API was not dealing correctly when a
later backend returned GIT_ENOTFOUND even if an earlier backend
had found the object.
Additionally, the unit tests were not properly exercising the API
and had a couple mistakes in checking the results.
Lastly, since the backends are not expected to behavior correctly
unless all bytes of the short id are zero except for the prefix,
this makes the ODB prefix APIs explicitly clear out the extra
bytes so the user doesn't have to be as careful.
|
|\ \ \ \
| | | | |
| | | | | |
Const up members of git_merge_file_result
|
|/ / / / |
|
|\ \ \ \
| | | | |
| | | | | |
Introduce git_merge_head_id
|
| | | | | |
|
|\ \ \ \ \
| |/ / / /
|/| | | | |
Don't reset need_pack
|
|/ / / /
| | | |
| | | | |
While looping over multiple heads, an up-to-date head will clobber the `remote->need_pack` setting, preventing the rest of the machinery from building and downloading a pack-file, breaking fetches.
|
|\ \ \ \
| | | | |
| | | | | |
Update clar to 4b75388
|
|/ / / / |
|