summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | conflicts: when adding conflicts, remove stagedEdward Thomson2015-05-285-3/+71
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | diff: wrap the iterator functionsEdward Thomson2015-05-281-25/+73
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | index iterator: optionally include conflictsEdward Thomson2015-05-282-7/+13
| | |/ | |/|
* | | Merge pull request #3149 from libgit2/cmn/upstream-matching-pushEdward Thomson2015-05-284-3/+54
|\ \ \ | | | | | | | | Fill the pointers for matching refspecs
| * | | branch: error out if we cannot find the remotecmn/upstream-matching-pushCarlos Martín Nieto2015-05-222-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | refspec: make sure matching refspecs have src, dst and input stringsCarlos Martín Nieto2015-05-222-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #3127 from libgit2/cmn/remote-fixupsCarlos Martín Nieto2015-05-288-96/+88
|\ \ \ \ | |_|/ / |/| | | Tackle remote API issues from bindings
| * | | remote: call the update_tips callback for opportunisitc updatesCarlos Martín Nieto2015-05-281-9/+31
| | | | | | | | | | | | | | | | | | | | These are updates, same as the rest, we should call this callback. As we are using the callback, let's make sure to skip unnecessary updates.
| * | | remote: validate refspecs before adding to configCarlos Martín Nieto2015-05-283-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | remote: remove fetch parameter from create_anonymousCarlos Martín Nieto2015-05-287-30/+17
| | | | | | | | | | | | | | | | | | | | | | | | An anonymous remote is not configured and cannot therefore have configured refspecs. Remove the parameter which adds this from the constructor.
| * | | remote: get rid of the run-time refspec settersCarlos Martín Nieto2015-05-173-42/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were left over from the culling as it's not clear which use-cases might benefit from this. It is not clear that we want to support any use-case which depends on changing the remote's idea of the base refspecs rather than passing in different per-operation refspec list, so remove these functions.
| * | | clone: don't rely on auto-saving for single-branchCarlos Martín Nieto2015-05-171-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Fix typos in the CHANGELOGCarlos Martín Nieto2015-05-171-3/+3
| | | |
* | | | Merge pull request #3160 from b4n/ident-same-as-gitCarlos Martín Nieto2015-05-285-17/+17
|\ \ \ \ | |_|_|/ |/| | | Fix ident replacement to match Git behavior
| * | | Fix ident replacement to match Git behaviorColomban Wendling2015-05-265-17/+17
|/ / / | | | | | | | | | | | | Git inserts a space after the SHA1 (as of 2.1.4 at least), so do the same.
* | | Merge pull request #3151 from ethomson/thinpackCarlos Martín Nieto2015-05-222-1/+21
|\ \ \ | | | | | | | | Thin packs: don't
| * | | indexer: avoid loading already existent basesEdward Thomson2015-05-221-1/+14
| | | | | | | | | | | | | | | | | | | | When thickening a pack, avoid loading already loaded bases and trying to insert them all over again.
| * | | indexer: don't look for the index we're creatingEdward Thomson2015-05-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | When creating an index, know that we do not have an index for our own packfile, preventing some unnecessary file opens and error reporting.
* | | | Merge pull request #3108 from libgit2/cmn/ssl-no-wantEdward Thomson2015-05-221-16/+5
|\ \ \ \ | |/ / / |/| | | openssl: don't try to handle WANT_READ or WANT_WRITE
| * | | openssl: don't try to handle WANT_READ or WANT_WRITEcmn/ssl-no-wantCarlos Martín Nieto2015-05-091-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use a blocking socket and set the mode to AUTO_RETRY which means that `SSL_write` and `SSL_read` will only return once the read or write has been completed. We therefore don't need to handle partial writes or re-try read due to a regenotiation. While here, consider that a zero also indicates an error condition.
* | | | travis: build maint branchesCarlos Martín Nieto2015-05-221-1/+1
| |_|/ |/| |
* | | Merge branch 'sni'Carlos Martín Nieto2015-05-211-0/+3
|\ \ \
| * | | Call the openssl API to be able to work with SNI servers.Cristian Oneț2015-05-211-0/+3
| | | |
* | | | Merge pull request #3145 from stinb/fix_cxx_buildCarlos Martín Nieto2015-05-211-1/+1
|\ \ \ \ | | | | | | | | | | Fix error when building as C++.
| * | | | Fix error when building as C++.Jason Haslam2015-05-201-1/+1
| | | | |
* | | | | Merge pull request #3146 from ethomson/add_untracked_filesCarlos Martín Nieto2015-05-212-1/+26
|\ \ \ \ \ | | | | | | | | | | | | index_add_all: include untracked files in new subdirs
| * | | | | git_index_add_all: don't recurse ignored dirsEdward Thomson2015-05-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to get reports about individual ignored files, having a single ignored directory delta is enough.
| * | | | | index_add_all: include untracked files in new subdirsEdward Thomson2015-05-202-1/+27
| |/ / / /
* | | | | Merge pull request #3144 from libgit2/cmn/ignored-ignoreEdward Thomson2015-05-202-0/+13
|\ \ \ \ \ | |/ / / / |/| | | | ignore: clear the error when matching a pattern negation
| * | | | ignore: clear the error when matching a pattern negationcmn/ignored-ignoreCarlos Martín Nieto2015-05-202-0/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | 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.
* | | | Add a missing include for resetCarlos Martín Nieto2015-05-201-0/+1
| | | | | | | | | | | | | | | | | | | | Our doc parser really wants the types to be declared in the header it's reading.
* | | | Merge pull request #3137 from libgit2/cmn/server-errorsCarlos Martín Nieto2015-05-205-3/+25
|\ \ \ \ | |/ / / |/| | | Improve server error reporting
| * | | errors: add GIT_EEOF to indicate early EOFcmn/server-errorsCarlos Martín Nieto2015-05-205-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | ssh: read from stderr if stdout is emptyCarlos Martín Nieto2015-05-202-1/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #3109 from libgit2/cmn/index-use-diffEdward Thomson2015-05-193-69/+118
|\ \ \ | | | | | | | | Use a diff for iteration in index_update_all and index_add_all
| * | | index: add a CHANGELOG entry for the diff usagecmn/index-use-diffCarlos Martín Nieto2015-05-141-0/+3
| | | |
| * | | index: include TYPECHANGE in the diffCarlos Martín Nieto2015-05-142-1/+15
| | | | | | | | | | | | | | | | Without this option, we would not be able to catch exec bit changes.
| * | | index: make add_all to act on a diffCarlos Martín Nieto2015-05-141-80/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | index: refactor diff-based update_all to match other appliesCarlos Martín Nieto2015-05-141-80/+87
| | | | | | | | | | | | | | | | | | | | Refactor so we look like the code we're replacing, which should also allow us to more easily inplement add-all.
| * | | index: use a diff to perform update_allCarlos Martín Nieto2015-05-141-2/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #3132 from libgit2/cmn/path-direach-cberrorEdward Thomson2015-05-192-2/+8
|\ \ \ \ | |_|_|/ |/| | | Provide error messages for git_path_direach operations
| * | | fileops: set an error on write error for file copycmn/path-direach-cberrorCarlos Martín Nieto2015-05-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | fileops: set an error message if we fail to link a fileCarlos Martín Nieto2015-05-151-1/+2
| | | | | | | | | | | | | | | | | | | | Now that `git_path_direach` lets us specify an error message to report, set an appropriate error message while linking.
| * | | path: don't let direach overwrite the callback's error messageCarlos Martín Nieto2015-05-151-1/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #3130 from mortonfox/patch-1Carlos Martín Nieto2015-05-151-1/+1
|\ \ \ | | | | | | | | Updated dlibgit link.
| * | | Updated dlibgit link.Morton Fox2015-05-141-1/+1
| | | |
* | | | Merge pull request #3129 from Therzok/patch-2Carlos Martín Nieto2015-05-141-2/+2
|\ \ \ \ | |/ / / |/| | | Bring Early EOF message in line with the other two
| * | | Make "Early EOF" message start with lowercaseMarius Ungureanu2015-05-141-2/+2
|/ / /
* | | local: plug a leak in the progress reportingCarlos Martín Nieto2015-05-141-1/+5
| | |
* | | Merge pull request #3128 from libgit2/cmn/push-notify-deletedEdward Thomson2015-05-142-3/+118
|\ \ \ | |/ / |/| | Add tests for and fix push negotiation notification