summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Don't leak memory when duplicating a NULL signatureBen Straub2013-11-122-5/+7
|
* Fix buffer blame with new lines at end of fileBen Straub2013-11-121-9/+6
|
* Duplicate all fields of a blame hunkBen Straub2013-11-121-0/+5
|
* Fix warningsLinquize2013-11-123-3/+3
|
* Merge pull request #1956 from libgit2/cmn/fetch-default-headVicent Martí2013-11-1112-178/+313
|\ | | | | Remote revamp (director's cut)
| * remote: update head list on pushCarlos Martín Nieto2013-11-113-11/+27
| | | | | | | | | | A previous commit forgot to update the head list after push as well, leading to wrong output of git_remote_ls().
| * remote: let's at least pretend to have some memory safetyCarlos Martín Nieto2013-11-111-3/+27
| | | | | | | | | | | | Copy the pointers into temporary vectors instead of assigning them tot he same array so we don't mess up with someone else's memory by accident (e.g. by sorting).
| * remote: fix a couple of leaksCarlos Martín Nieto2013-11-112-7/+4
| |
| * remote: make _ls return the list directlyCarlos Martín Nieto2013-11-118-84/+71
| | | | | | | | | | | | | | | | | | | | | | 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-102-24/+68
| | | | | | | | | | | | 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: store dwimed refspecs separatelyCarlos Martín Nieto2013-11-016-90/+128
| | | | | | | | | | This allows us to add e.g. "HEAD" as a refspec when none are given without overwriting the user's data.
| * remote: create FETCH_HEAD with a refspecless remoteCarlos Martín Nieto2013-11-012-0/+27
| | | | | | | | | | | | When downloading the default branch due to lack of refspecs, we still need to write out FETCH_HEAD with the tip we downloaded, unfortunately with a format that doesn't match what we already have.
| * remote: give up after 256 failures to find a common objectCarlos Martín Nieto2013-11-011-5/+6
| | | | | | | | | | | | | | This avoids sending our whole history bit by bit to the remote in cases where there is no common history, just to give up in the end. The number comes from the canonical implementation.
| * remote: download HEAD when no refspecs are givenCarlos Martín Nieto2013-11-011-5/+6
| | | | | | | | | | | | | | 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.
* | config_file: styleVicent Marti2013-11-101-18/+18
| |
* | Merge pull request #1950 from csware/quote-config-valuesVicent Martí2013-11-101-2/+24
|\ \ | | | | | | Correctly quote config values while saving
| * | Rename methodSven Strickroth2013-11-071-3/+3
| | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | Correctly quote config values while savingSven Strickroth2013-11-071-2/+24
| | | | | | | | | | | | | | | | | | If the value contains a command (; or #) char or starts or ends with space it needs to be quoted. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | Merge pull request #1936 from libgit2/better-url-parsingVicent Martí2013-11-104-86/+92
|\ \ \ | | | | | | | | Streamline url-parsing logic.
| * | | Make url decoding more bulletproofbetter-url-parsingBen Straub2013-11-051-12/+7
| | | |
| * | | Remove unnecessary checkBen Straub2013-11-051-1/+1
| | | |
| * | | Incorporate feedbackBen Straub2013-11-051-5/+5
| | | |
| * | | Fix ssh.c compileBen Straub2013-11-041-2/+3
| | | |
| * | | Unescape url-encoded usernames and passwordsBen Straub2013-11-041-2/+26
| | | |
| * | | Use http_parser_parse_url to parse urlsBen Straub2013-11-044-89/+74
| | | |
| * | | Clarify parsing issues and errorsBen Straub2013-11-011-2/+3
| | | |
| * | | Streamline url-parsing logic.Ben Straub2013-11-011-25/+25
| | |/ | |/|
* | | Allow callers to set mode on packfile creationEdward Thomson2013-11-073-4/+8
| | |
* | | Add git_packbuilder_hash to query pack filenameEdward Thomson2013-11-071-2/+10
| | |
* | | don't double free pktEdward Thomson2013-11-051-1/+1
| | |
* | | 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
|/ / /
* | | Fix MSVC 64-bit warningsBen Straub2013-11-052-10/+10
| | |
* | | Plug configuration file search paths leaksnulltoken2013-11-052-1/+6
| | |
* | | Plug git_merge() related leaksnulltoken2013-11-051-0/+1
| | |
* | | merge branch into current, updating workdirEdward Thomson2013-11-052-18/+536
| | |
* | | Merge pull request #1943 from libgit2/ntk/fix/leaksVicent Martí2013-11-051-2/+5
|\ \ \ | | | | | | | | Fix leaks
| * | | Fix leaksnulltoken2013-11-051-2/+5
| | | |
* | | | Merge pull request #1938 from libgit2/cmn/branch-iteratorVicent Martí2013-11-051-32/+50
|\ \ \ \ | | | | | | | | | | branch: move from foreach to an iterator
| * | | | branch: move from foreach to an iteratorCarlos Martín Nieto2013-11-051-32/+50
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-052-0/+31
|\ \ \ \ | |/ / / |/| | | Preserve error messages during file system iterator cleanup
| * | | error: Simplify giterr_detachVicent Marti2013-11-052-16/+12
| | | |
| * | | Preserve file error in iteratorRussell Belfer2013-11-041-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the filesystem iterator encounters an error with a file, it returns the error but because of the cleanup code, it was in some cases erasing the error message. This uses the giterr_detach API to make sure that the actual error message is restored after the cleanup code has been run.
| * | | Add giterr_detach API to get and clear errorRussell Belfer2013-11-041-0/+23
| | |/ | |/| | | | | | | | | | | | | | | | | | | 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.
* | | Propagate ELOCKED error when updating the confignulltoken2013-11-051-4/+4
| | |
* | | move mode_t to filebuf_open instead of _commitEdward Thomson2013-11-0415-60/+63
| | |
* | | Take umask into account in filebuf_commitEdward Thomson2013-11-042-3/+7
|/ /
* | Merge pull request #1939 from ethomson/readwrite_odbVicent Martí2013-11-042-5/+17
|\ \ | | | | | | Allow backend consumers to specify file mode
| * | Allow backend consumers to specify file modeEdward Thomson2013-11-042-5/+17
| | |