Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-28diff conflicts: test index to workdir w/ conflictsEdward Thomson
2015-05-28diff conflicts: add tests for tree to indexEdward Thomson
2015-05-28diff: for conflicts w/o workdir, blank nitem sideEdward Thomson
Make sure that we provide a blanked nitem side when the item does not exist in the working directory.
2015-05-28diff/status: introduce conflictsEdward Thomson
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.
2015-05-28index: validate mode of new conflictsEdward Thomson
2015-05-28index: remove error message in non-error removeEdward Thomson
If `git_index_remove_bypath` does no work, and returns an OK error code, it should not set an error message.
2015-05-28conflicts: when adding conflicts, remove stagedEdward Thomson
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.
2015-05-28diff: wrap the iterator functionsEdward Thomson
Wrap the iterator current / advance functions so that we can extend them, but also handle GIT_ITEROVER cases in the iterator funcs instead of the callers.
2015-05-28index iterator: optionally include conflictsEdward Thomson
2015-05-28Merge pull request #3160 from b4n/ident-same-as-gitCarlos Martín Nieto
Fix ident replacement to match Git behavior
2015-05-26Fix ident replacement to match Git behaviorColomban Wendling
Git inserts a space after the SHA1 (as of 2.1.4 at least), so do the same.
2015-05-22Merge pull request #3151 from ethomson/thinpackCarlos Martín Nieto
Thin packs: don't
2015-05-22indexer: avoid loading already existent basesEdward Thomson
When thickening a pack, avoid loading already loaded bases and trying to insert them all over again.
2015-05-22indexer: don't look for the index we're creatingEdward Thomson
When creating an index, know that we do not have an index for our own packfile, preventing some unnecessary file opens and error reporting.
2015-05-22Merge pull request #3108 from libgit2/cmn/ssl-no-wantEdward Thomson
openssl: don't try to handle WANT_READ or WANT_WRITE
2015-05-22travis: build maint branchesCarlos Martín Nieto
2015-05-21Merge branch 'sni'Carlos Martín Nieto
2015-05-21Call the openssl API to be able to work with SNI servers.Cristian Oneț
2015-05-21Merge pull request #3145 from stinb/fix_cxx_buildCarlos Martín Nieto
Fix error when building as C++.
2015-05-21Merge pull request #3146 from ethomson/add_untracked_filesCarlos Martín Nieto
index_add_all: include untracked files in new subdirs
2015-05-21git_index_add_all: don't recurse ignored dirsEdward Thomson
No need to get reports about individual ignored files, having a single ignored directory delta is enough.
2015-05-21Merge pull request #3144 from libgit2/cmn/ignored-ignoreEdward Thomson
ignore: clear the error when matching a pattern negation
2015-05-21index_add_all: include untracked files in new subdirsEdward Thomson
2015-05-20Fix error when building as C++.Jason Haslam
2015-05-20ignore: clear the error when matching a pattern negationCarlos Martín Nieto
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.
2015-05-20Add a missing include for resetCarlos Martín Nieto
Our doc parser really wants the types to be declared in the header it's reading.
2015-05-20Merge pull request #3137 from libgit2/cmn/server-errorsCarlos Martín Nieto
Improve server error reporting
2015-05-20errors: add GIT_EEOF to indicate early EOFCarlos Martín Nieto
This can be used by tools to show mesages about failing to communicate with the server. The error message in this case will often contain the server's error message, as far as it managed to send anything.
2015-05-20ssh: read from stderr if stdout is emptyCarlos Martín Nieto
When we fail to read from stdout, it's typically because the URL was wrong and the server process has sent some output over its stderr output. Read that output and set the error message to whatever we read from it.
2015-05-19Merge pull request #3109 from libgit2/cmn/index-use-diffEdward Thomson
Use a diff for iteration in index_update_all and index_add_all
2015-05-19Merge pull request #3132 from libgit2/cmn/path-direach-cberrorEdward Thomson
Provide error messages for git_path_direach operations
2015-05-17fileops: set an error on write error for file copyCarlos Martín Nieto
We set an error if we get an error when reading, but we don't bother setting an error message for write failing. This causes a cryptic error to be shown to the user when the target filesystem is full.
2015-05-15fileops: set an error message if we fail to link a fileCarlos Martín Nieto
Now that `git_path_direach` lets us specify an error message to report, set an appropriate error message while linking.
2015-05-15path: don't let direach overwrite the callback's error messageCarlos Martín Nieto
This function deals with functions doing IO which means the amount of errors that can happen is quit large. It does not help if it always ovewrites the underlying error message with a less understandable version of "something went wrong". Instead, only use this generic message if there was no error set by the callback.
2015-05-15Merge pull request #3130 from mortonfox/patch-1Carlos Martín Nieto
Updated dlibgit link.
2015-05-14Merge pull request #3129 from Therzok/patch-2Carlos Martín Nieto
Bring Early EOF message in line with the other two
2015-05-14Updated dlibgit link.Morton Fox
2015-05-14Make "Early EOF" message start with lowercaseMarius Ungureanu
2015-05-14local: plug a leak in the progress reportingCarlos Martín Nieto
2015-05-14index: add a CHANGELOG entry for the diff usageCarlos Martín Nieto
2015-05-14index: include TYPECHANGE in the diffCarlos Martín Nieto
Without this option, we would not be able to catch exec bit changes.
2015-05-14index: make add_all to act on a diffCarlos Martín Nieto
Instead of going through each entry we have and re-adding, which may not even be correct for certain crlf options and has bad performance, use the function which performs a diff against the worktree and try to add and remove files from that list.
2015-05-14index: refactor diff-based update_all to match other appliesCarlos Martín Nieto
Refactor so we look like the code we're replacing, which should also allow us to more easily inplement add-all.
2015-05-14index: use a diff to perform update_allCarlos Martín Nieto
We currently iterate over all the entries and re-add them to the index. While this provides correctness, it is wasteful as we try to re-insert files which have not changed. Instead, take a diff between the index and the worktree and only re-add those which we already know have changed.
2015-05-14Merge pull request #3128 from libgit2/cmn/push-notify-deletedEdward Thomson
Add tests for and fix push negotiation notification
2015-05-14push: fix the update constructorCarlos Martín Nieto
There was a copypasta error and the source and destination IDs were reversed.
2015-05-14push: add tests for the push negotiation callbackCarlos Martín Nieto
The functionality was meged without including tests, so let's add them now.
2015-05-14Add CHANGELOG entry for index entry changesCarlos Martín Nieto
2015-05-13Merge pull request #3119 from ethomson/ignoreCarlos Martín Nieto
Attributes: don't match files for folders
2015-05-13Merge pull request #3103 from libgit2/cmn/local-push-messageEdward Thomson
Use the packbuilder in local push