summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Don't use weird return codesBen Straub2013-12-051-3/+8
|
* Implement GIT_DIFF_FIND_BY_CONFIGBen Straub2013-12-051-11/+17
|
* Bare naked merge and rebaseEdward Thomson2013-12-032-41/+103
|
* Merge pull request #1981 from jamill/download_cancel_tweaksVicent Martí2013-12-032-19/+39
|\ | | | | Updates to cancellation logic during download and indexing of packfile.
| * Updates to cancellation logic during download and indexing of packfile.Jameson Miller2013-12-022-19/+39
| |
* | Merge pull request #1977 from ethomson/revertVicent Martí2013-12-038-43/+290
|\ \ | | | | | | Revert support for a single commit
| * | clean up state metadata more consistentlyEdward Thomson2013-12-026-78/+59
| | |
| * | Introduce git_revert to revert a single commitEdward Thomson2013-12-026-8/+274
| |/
* | GIT_DIFF_FIND_REMOVE_UNMODIFIED sounds betterRussell Belfer2013-12-021-1/+1
| |
* | Add GIT_DIFF_FIND_DELETE_UNMODIFIED flagRussell Belfer2013-12-021-0/+2
| | | | | | | | | | | | | | | | | | | | When doing copy detection, it is often necessary to include UNMODIFIED records in the git_diff so they are available as source records for GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED. Yet in the final diff, often you will not want to have these UNMODIFIED records. This adds a flag which marks these UNMODIFIED records for deletion from the diff list so they will be removed after the rename detect phase is over.
* | Fix bug making split deltas a COPIED targetsRussell Belfer2013-12-021-16/+30
|/ | | | | | | | When FIND_COPIES is used in combination with BREAK_REWRITES for rename detection, there was a bug where the split MODIFIED delta was only used as a target for RENAME records and not for COPIED records. This fixes that, converting the split into a pair of DELETED and COPIED deltas when that circumstance arises.
* posix: Solaris doesn't have strnlen eitherAlessandro Ghedini2013-11-272-6/+6
|
* ssh: add support for ssh-agent authenticationAlessandro Ghedini2013-11-202-2/+74
|
* Merge pull request #1966 from nickh/patch_content_offsetsVicent Martí2013-11-191-4/+13
|\ | | | | Add content offset to git_diff_line
| * Add content offset to git_diff_lineNick Hengeveld2013-11-181-4/+13
| | | | | | | | | | | | For additions and deletions, external consumers like subversion can make use of the content offset to generate diffs in their proprietary formats.
* | util: NetBSD doesn't have qsort_r eitherAlessandro Ghedini2013-11-191-1/+2
| |
* | Merge pull request #1968 from libgit2/ntk/fix/bad_indexVicent Martí2013-11-192-7/+18
|\ \ | | | | | | Corrupted index is bad for your health
| * | index: Free the index on git_index_open() failurenulltoken2013-11-191-1/+7
| | |
| * | tree-cache: Fix error message typonulltoken2013-11-191-2/+2
| | |
| * | tree-cache: Don't segfault upon corruptionnulltoken2013-11-191-3/+6
| | |
| * | tree-cache: Zero out the allocated tree children arraynulltoken2013-11-191-0/+2
| | |
| * | tree-cache: Free the tree upon the detection of a corrupted childnulltoken2013-11-191-1/+1
| |/
* | Merge pull request #1967 from victorgp/cleaning-code-minor-changeVicent Martí2013-11-191-4/+0
|\ \ | |/ |/| Cleaning code, removing unused variables
| * cleaning code, removing unused variablesVictor Garcia2013-11-191-4/+0
| |
* | netops: fix leakCarlos Martín Nieto2013-11-181-2/+5
| |
* | Fix warningsRussell Belfer2013-11-182-5/+5
| |
* | Introduce git_cred_default for NTLM/SPNEGO authEdward Thomson2013-11-182-0/+55
| |
* | Propagate auth error codes as GIT_EUSER in winhttpEdward Thomson2013-11-183-37/+56
|/
* Merge pull request #1951 from victorgp/create-remote-plus-fetchVicent Martí2013-11-141-0/+30
|\ | | | | Allowing create remotes with custom fetch spec
| * splitting funcionality in two methods to avoid ambiguity with NULLVictor Garcia2013-11-083-8/+35
| |
| * allowing create remote with custom fetch specVictor Garcia2013-11-073-6/+9
| |
* | Fix warningsRussell Belfer2013-11-133-4/+6
| |
* | 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>
View Lorry Controller Status