summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1956 from libgit2/cmn/fetch-default-headVicent Martí2013-11-112-23/+41
|\ | | | | Remote revamp (director's cut)
| * remote: make _ls return the list directlyCarlos Martín Nieto2013-11-112-12/+13
| | | | | | | | | | | | | | | | | | | | | | The callback-based method of listing remote references dates back to the beginning of the network code's lifetime, when we didn't know any better. We need to keep the list around for update_tips() after disconnect() so let's make use of this to simply give the user a pointer to the array so they can write straightforward code instead of having to go through a callback.
| * remote: don't allow such direct access to the refspecsCarlos Martín Nieto2013-11-101-10/+27
| | | | | | | | | | | | Removing arbitrary refspecs makes things more complex to reason about. Instead, let the user set the fetch and push refspec list to whatever they want it to be.
| * remote: download HEAD when no refspecs are givenCarlos Martín Nieto2013-11-011-1/+1
| | | | | | | | | | | | | | The correct behaviour when a remote has no refspecs (e.g. a URL from the command-line) is to download the remote's HEAD. Let's do that. This fixes #1261.
* | Allow callers to set mode on packfile creationEdward Thomson2013-11-072-0/+4
| |
* | Add git_packbuilder_hash to query pack filenameEdward Thomson2013-11-071-0/+10
| |
* | Merge pull request #1946 from arthurschreiber/change-branch-iterator-definitionCarlos Martín Nieto2013-11-051-2/+2
|\ \ | | | | | | Change the git_branch_iterator_new definition to use git_branch_t
| * | Change the git_branch_iterator_new and git_branch_next definitions to use ↵Arthur Schreiber2013-11-051-2/+2
| | | | | | | | | | | | git_branch_t.
* | | Blame: change signature to be more binding-friendlyBen Straub2013-11-051-1/+1
|/ /
* | merge branch into current, updating workdirEdward Thomson2013-11-052-0/+63
| |
* | Merge pull request #1938 from libgit2/cmn/branch-iteratorVicent Martí2013-11-051-16/+24
|\ \ | | | | | | branch: move from foreach to an iterator
| * | branch: move from foreach to an iteratorCarlos Martín Nieto2013-11-051-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | Create a git_branch_iterator type which is equivalent to the foreach but lets us write loops instead of callbacks. Since the introduction of git_reference_shorthand(), the added value of passing the name is reduced.
* | | Merge pull request #1941 from libgit2/rb/preserve-iterator-errorVicent Martí2013-11-051-0/+14
|\ \ \ | |/ / |/| | Preserve error messages during file system iterator cleanup
| * | error: Simplify giterr_detachVicent Marti2013-11-051-9/+6
| | |
| * | Add giterr_detach API to get and clear errorRussell Belfer2013-11-041-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | There are a number of cases where it is convenient to be able to fetch and "claim" the current error string, clearing the error. This is helpful when you need to call some code that may alter the error and you want to restore it later on and/or report it via some other mechanism.
* | | Take umask into account in filebuf_commitEdward Thomson2013-11-041-2/+2
|/ /
* | Merge pull request #1939 from ethomson/readwrite_odbVicent Martí2013-11-041-1/+9
|\ \ | | | | | | Allow backend consumers to specify file mode
| * | Allow backend consumers to specify file modeEdward Thomson2013-11-041-1/+9
| |/
* | Merge pull request #1317 from libgit2/blameRussell Belfer2013-11-043-0/+216
|\ \ | | | | | | Blame Canada
| * \ Merge remote-tracking branch 'libgit2/development' into blameBen Straub2013-10-2820-531/+740
| |\ \
| * | | Move flag dependencies into docs and code.Ben Straub2013-10-101-4/+4
| | | |
| * | | Include signatures in blame hunksBen Straub2013-10-101-0/+2
| | | |
| * | | Merge branch 'development' into blameBen Straub2013-10-038-93/+218
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: include/git2.h
| * \ \ \ Merge branch 'development' into blameBen Straub2013-09-2512-18/+615
| |\ \ \ \
| * | | | | Trim API, document which parts aren't doneBen Straub2013-09-251-6/+8
| | | | | |
| * | | | | Blame: minor cleanupBen Straub2013-09-251-1/+1
| | | | | |
| * | | | | Detect boundaries, support limiting commit rangeBen Straub2013-09-201-0/+4
| | | | | |
| * | | | | Port blame from git.gitBen Straub2013-09-162-30/+58
| | | | | |
| * | | | | Merge branch 'development' into blame_rebasedBen Straub2013-09-1639-298/+1141
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/git2.h
| * | | | | | Fix spelling, remove pesky constsBen Straub2013-06-131-3/+3
| | | | | | |
| * | | | | | Introduce git_blame_bufferBen Straub2013-06-131-0/+14
| | | | | | |
| * | | | | | Change API based on @arrbee's feedbackBen Straub2013-06-131-13/+33
| | | | | | |
| * | | | | | Initial blame APIBen Straub2013-06-132-0/+146
| | | | | | |
* | | | | | | Merge pull request #1937 from scunz/checkout_assertVicent Martí2013-11-041-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't assert in git_checkout_tree
| * | | | | | | Checkout: Don't assert if treeish is NULLSascha Cunz2013-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In git_checkout_tree, the first check tests if either repo or treeish is NULL and says that eithor of them has to have a valid value. But there is no code to handle the treeish == NULL case. So, do something meaningful in that case: use HEAD instead.
| * | | | | | | Checkout: Unifiy const-ness of `opts` parameterSascha Cunz2013-11-021-2/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Since all 3 checkout APIs perform the same operation with the options, all of them should use the same const-ness.
* | | | | | | Add git_diff_options_init helperRussell Belfer2013-11-012-13/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the static initializer for git_diff_options cannot be used and since setting them to all zeroes doesn't actually work quite right, this adds a new helper for that situation. This also adds an explicit new value to the submodule settings options to be used when those enums need static initialization.
* | | | | | | Convert git_index_read to have a "force" flagRussell Belfer2013-11-011-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a little more intuitive than the turned-around option that I originally wrote.
* | | | | | | Make diff and status perform soft index reloadRussell Belfer2013-11-013-5/+24
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes `git_index_read` to have two modes - a hard index reload that always resets the index to match the on-disk data (which was the old behavior) and a soft index reload that uses the timestamp / file size information and only replaces the index data if the file on disk has been modified. This then updates the git_status code to do a soft reload unless the new GIT_STATUS_OPT_NO_REFRESH flag is passed in. This also changes the behavior of the git_diff functions that use the index so that when an index is not explicitly passed in (i.e. when the functions call git_repository_index for you), they will also do a soft reload for you. This intentionally breaks the file signature of git_index_read because there has been some confusion about the behavior previously and it seems like all existing uses of the API should probably be examined to select the desired behavior.
* | | | | | Merge pull request #1918 from libgit2/cmn/indexer-namingVicent Martí2013-11-012-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | indexer: remove the stream infix
| * | | | | | indexer: remove the stream infixCarlos Martín Nieto2013-10-302-9/+9
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was there to keep it apart from the one which read in from a file on disk. This other indexer does not exist anymore, so there is no need for anything other than git_indexer to refer to it. While here, rename _add() function to _append() and _finalize() to _commit(). The former change is cosmetic, while the latter avoids talking about "finalizing", which OO languages use to mean something completely different.
* | | | | | Fix saving remotes with several fetch/push ref specs.Daniel Rodríguez Troitiño2013-11-012-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some moment git_config_delete_entry lost the ability to delete one entry of a multivar configuration. The moment you had more than one fetch or push ref spec for a remote you will not be able to save that remote anymore. The changes in network::remote::remotes::save show that problem. I needed to create a new git_config_delete_multivar because I was not able to remove one or several entries of a multivar config with the current API. Several tries modifying how git_config_set_multivar(..., NULL) behaved were not successful. git_config_delete_multivar is very similar to git_config_set_multivar, and delegates into config_delete_multivar of config_file. This function search for the cvar_t that will be deleted, storing them in a temporal array, and rebuilding the linked list. After calling config_write to delete the entries, the cvar_t stored in the temporal array are freed. There is a little fix in config_write, it avoids an infinite loop when using a regular expression (case for the multivars). This error was found by the test network::remote::remotes::tagopt.
* | | | | | Remove leftover function declarationCarlos Martín Nieto2013-10-301-15/+0
|/ / / / /
* | | | | Merge pull request #1891 from libgit2/cmn/fix-thin-packsVicent Martí2013-10-283-1/+15
|\ \ \ \ \ | | | | | | | | | | | | Add support for thin packs
| * | | | | indexer: include the delta statsCarlos Martín Nieto2013-10-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user is unable to derive the number of deltas in the pack, as that would require them to capture the stats exactly in the moment between download and final processing, which is abstracted away in the fetch. Capture these numbers for the user and expose them in the progress struct. The clone and fetch examples now also present this information to the user.
| * | | | | indexer: clearer stats for thin packsCarlos Martín Nieto2013-10-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't increase the number of total objects, as it can produce suprising progress output. The only addition compared to pre-thin is the addition of local_objects to allow an output similar to git's "completed with %d local objects".
| * | | | | indexer: fix thin packsCarlos Martín Nieto2013-10-043-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When given an ODB from which to read objects, the indexer will attempt to inject the missing bases at the end of the pack and update the header and trailer to reflect the new contents.
* | | | | | Merge pull request #1904 from libgit2/cmn/ssh-namingVicent Martí2013-10-281-16/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rename the ssh credentials
| * | | | | | Rename the ssh credentialsCarlos Martín Nieto2013-10-231-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The names from libssh2 are somewhat obtuse for us. We can simplify the usual key/passphrase credential's name, as well as make clearer what the custom signature function is.
* | | | | | | Merge pull request #1802 from libgit2/cmn/reflog-backendBen Straub2013-10-283-8/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make reflog part of refdb
View Lorry Controller Status