summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Minor cleanupblame-fixesBen Straub2013-11-121-3/+2
|
* 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-122-11/+9
|
* Duplicate all fields of a blame hunkBen Straub2013-11-121-0/+5
|
* Add some failing blame test casesBen Straub2013-11-121-0/+36
|
* Merge pull request #1957 from linquize/warning3Vicent Martí2013-11-124-4/+4
|\ | | | | Fix warnings
| * Fix warningsLinquize2013-11-124-4/+4
|/
* Merge pull request #1956 from libgit2/cmn/fetch-default-headVicent Martí2013-11-1120-287/+433
|\ | | | | 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().
| * tests: update push testsCarlos Martín Nieto2013-11-113-19/+23
| | | | | | | | These tests were forgotten when modifying 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-1116-163/+140
| | | | | | | | | | | | | | | | | | | | | | 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-103-34/+95
| | | | | | | | | | | | 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-012-6/+7
| | | | | | | | | | | | | | 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.
* | Merge pull request #1955 from linquize/trivial.c-warningVicent Martí2013-11-101-1/+1
|\ \ | | | | | | Fix warning in tests-clar/merge/workdir/trivial.c
| * | Fix warning in tests-clar/merge/workdir/trivial.cLinquize2013-11-111-1/+1
|/ /
* | config_file: styleVicent Marti2013-11-101-18/+18
| |
* | Merge pull request #1950 from csware/quote-config-valuesVicent Martí2013-11-102-2/+55
|\ \ | | | | | | Correctly quote config values while saving
| * | Rename methodSven Strickroth2013-11-071-3/+3
| | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | Add another testcase to make sure double quotes are correctly escapedSven Strickroth2013-11-071-0/+4
| | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | Add a testcase for values which needs quotesSven Strickroth2013-11-071-0/+27
| | | | | | | | | | | | 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-106-104/+135
|\ \ \ | | | | | | | | Streamline url-parsing logic.
| * | | Make url decoding more bulletproofbetter-url-parsingBen Straub2013-11-052-14/+9
| | | |
| * | | Remove unnecessary checkBen Straub2013-11-051-1/+1
| | | |
| * | | Incorporate feedbackBen Straub2013-11-051-5/+5
| | | |
| * | | Fix ssh.c compileBen Straub2013-11-041-2/+3
| | | |
| * | | Compile HTTP parser on win32 (for url parsing)Ben Straub2013-11-041-0/+2
| | | |
| * | | Unescape url-encoded usernames and passwordsBen Straub2013-11-042-4/+40
| | | |
| * | | Use http_parser_parse_url to parse urlsBen Straub2013-11-045-116/+102
| | | |
| * | | Clarify parsing issues and errorsBen Straub2013-11-011-2/+3
| | | |
| * | | Streamline url-parsing logic.Ben Straub2013-11-012-25/+35
| | |/ | |/|
* | | Merge pull request #1953 from ethomson/packfile_exampleVicent Martí2013-11-071-1/+1
|\ \ \ | | | | | | | | update example to new packfile creation signature
| * | | update example to new packfile creation signatureEdward Thomson2013-11-071-1/+1
|/ / /
* | | Merge pull request #1952 from ethomson/packfile_modeVicent Martí2013-11-077-10/+62
|\ \ \ | | | | | | | | Allow callers to set mode on packfile creation
| * | | Allow callers to set mode on packfile creationEdward Thomson2013-11-077-10/+62
|/ / /
* | | Merge pull request #1949 from ethomson/packbuilder_oidVicent Martí2013-11-073-2/+32
|\ \ \ | | | | | | | | Add git_packbuilder_hash to query pack filename
| * | | Add git_packbuilder_hash to query pack filenameEdward Thomson2013-11-073-2/+32
|/ / /
* | | Merge pull request #1947 from ethomson/double_free_pktVicent Martí2013-11-051-1/+1
|\ \ \ | | | | | | | | don't double free pkt
| * | | don't double free pktEdward Thomson2013-11-051-1/+1
|/ / /
* | | cmake: Add `USE_SSH` optionVicent Marti2013-11-051-1/+3
| | |
* | | Merge pull request #1946 from arthurschreiber/change-branch-iterator-definitionCarlos Martín Nieto2013-11-054-7/+7
|\ \ \ | | | | | | | | 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-054-7/+7
| | | | | | | | | | | | | | | | git_branch_t.
* | | | Blame: change signature to be more binding-friendlyBen Straub2013-11-052-2/+2
|/ / /
* | | Fix MSVC 64-bit warningsBen Straub2013-11-052-10/+10
| | |
* | | Merge pull request #1944 from libgit2/ntk/fix/config_search_paths_leaksVicent Martí2013-11-054-1/+16
|\ \ \ | | | | | | | | Plug configuration file search paths tests leaks