summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* features: Rename `_HAS_` to `_FEATURE_`vmg/featuresVicent Marti2014-03-033-16/+16
|
* caps: Rename the enum name too!Vicent Marti2014-03-031-1/+1
|
* caps: Rename to features to avoid confusionVicent Marti2014-03-033-20/+25
|
* Merge pull request #2144 from linquize/branch-f-currentBen Straub2014-03-022-0/+32
|\ | | | | Do not allow git_branch_create() to force update branch
| * Add unit test to show git_branch_create() fails if attempt to force create ↵Linquize2014-03-021-0/+19
| | | | | | | | current branch
| * Do not allow git_branch_create() to force update branchLinquize2014-02-271-0/+13
| |
* | Merge pull request #2143 from libgit2/rb/projectsVicent Marti2014-03-013-31/+103
|\ \ | | | | | | Add project list and update readme
| * | Add project list and update readmeRussell Belfer2014-02-263-31/+103
| | |
* | | Merge pull request #2146 from libgit2/rb/diff-b2bVicent Marti2014-02-287-318/+300
|\ \ \ | | | | | | | | Add git_diff_buffers and git_patch_from_buffers
| * | | Add buffer to buffer diff and patch APIsRussell Belfer2014-02-276-311/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds `git_diff_buffers` and `git_patch_from_buffers`. This also includes a bunch of internal refactoring to increase the shared code between these functions and the blob-to-blob and blob-to-buffer APIs, as well as some higher level assert helpers in the tests to also remove redundancy.
| * | | Fix warnings and code style issuesRussell Belfer2014-02-271-7/+11
|/ / /
* | | Merge pull request #2137 from jru/blame-first-parentBen Straub2014-02-264-2/+27
|\ \ \ | | | | | | | | Blame first-parent history
| * | | Reset num_parents to 1 only for merge commitsJuan Rubén2014-02-262-2/+2
| | | | | | | | | | | | | | | | Also, correct test case to account for the boundary flag
| * | | Document enumerator and rewordingJuan Rubén2014-02-242-2/+3
| | | |
| * | | Add unit testJuan Rubén2014-02-241-0/+15
| | | |
| * | | Add option to limit blame to first parentJuan Rubén2014-02-233-2/+11
| | | |
* | | | Merge pull request #2142 from ethomson/ignore_authorsVicent Marti2014-02-261-5/+0
|\ \ \ \ | |_|/ / |/| | | Remove "ignore" state from the git.git-authors
| * | | Remove "ignore" state from the git.git-authorsEdward Thomson2014-02-261-5/+0
|/ / /
* | | Merge pull request #2138 from ethomson/sysdirVicent Marti2014-02-2513-355/+396
|\ \ \ | | | | | | | | Move system directory cache out of utils
| * | | Move system directory cache out of utilsEdward Thomson2014-02-2413-355/+396
| | | |
* | | | Merge pull request #2139 from ethomson/va_copy_warningVicent Marti2014-02-2511-16/+2
|\ \ \ \ | |/ / / |/| | | Include stdarg.h for the va_copy test
| * | | Remove now-duplicated stdarg.h includeEdward Thomson2014-02-2410-16/+0
| | | |
| * | | Include stdarg.h for the va_copy testEdward Thomson2014-02-241-0/+2
|/ / /
* | | Merge pull request #2134 from libgit2/ben/iccVicent Marti2014-02-244-6/+8
|\ \ \ | | | | | | | | Fix Intel compiler warnings
| * | | Use a portable castBen Straub2014-02-241-2/+2
| | | |
| * | | Prevent icc warningBen Straub2014-02-241-1/+3
| | | |
| * | | Avoid casting warningBen Straub2014-02-241-2/+2
| | | |
| * | | Staticize file-local variablesBen Straub2014-02-242-3/+3
|/ / /
* | | Merge pull request #2132 from ethomson/merge_docVicent Marti2014-02-241-33/+127
|\ \ \ | | | | | | | | Improve documentation for merging
| * | | Improve documentation for mergingEdward Thomson2014-02-211-33/+127
| | | |
* | | | Merge pull request #2130 from worblehat/developmentRussell Belfer2014-02-211-1/+5
|\ \ \ \ | |/ / / |/| | | Check if librt exists independent of OS, to be able to exclude librt on ...
| * | | Check if librt exists independent of OS, to be able to exclude librt on ↵Tobias Marquardt2014-02-211-1/+5
| | | | | | | | | | | | | | | | Android builds, even though it is a 'Linux'.
* | | | Merge pull request #2129 from arrbee/rb/c89-or-c99Vicent Marti2014-02-2114-53/+71
|\ \ \ \ | |/ / / |/| | | Improve C89 compatibility and clarify use of C99 features
| * | | Address PR commentsRussell Belfer2014-02-2010-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make GIT_INLINE an internal definition so it cannot be used in public headers * Fix language in CONTRIBUTING * Make index caps API use signed instead of unsigned values
| * | | Clarify C compatibility policyRussell Belfer2014-02-203-21/+36
| | | | | | | | | | | | | | | | and a couple of other minor doc fixups.
| * | | Make git_oid_equal a non-inline APIRussell Belfer2014-02-202-4/+6
|/ / /
* | | Merge pull request #2124 from libgit2/better-shallow-errorsVicent Marti2014-02-192-2/+11
|\ \ \ | |/ / |/| | Improve error propagation in shallow call
| * | ReadabilityBen Straub2014-02-181-1/+3
| | |
| * | Improve error propagation in shallow callBen Straub2014-02-182-4/+11
|/ /
* | Merge pull request #2121 from bk2204/ewouldblockVicent Marti2014-02-182-1/+10
|\ \ | | | | | | Check for EWOULDBLOCK as well as EAGAIN on write.
| * | Check for EWOULDBLOCK as well as EAGAIN on write.brian m. carlson2014-02-162-1/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | On some systems, notably HP PA-RISC systems running Linux or HP-UX, EWOULDBLOCK and EAGAIN are not the same value. POSIX (and these OSes) allow EWOULDBLOCK to occur on write(2) (and send(2), etc.), so check explicitly for this case as well as EAGAIN by defining and using a macro GIT_ISBLOCKED that considers both. The macro is necessary because MSYS does not provide EWOULDBLOCK and compilation fails if an attempt is made to use it unconditionally. On most systems, where the two values are the same, the compiler will simply optimize this check out and it will have no effect.
* | Merge pull request #2115 from ethomson/crlf_reduxEdward Thomson2014-02-111-1/+2
|\ \ | | | | | | Fix filter test for CRLF->LF issues
| * | Fix filter test for CRLF->LF issuesEdward Thomson2014-02-111-1/+2
|/ /
* | Merge pull request #2114 from ethomson/crlf_reduxVicent Marti2014-02-121-17/+4
|\ \ | | | | | | Never convert CRLF->LF
| * | Never convert CRLF->LFEdward Thomson2014-02-111-17/+4
|/ / | | | | | | Core git performs no conversion on systems that use LF, emulate that.
* | Merge pull request #2110 from libgit2/ed/crlf_inputRussell Belfer2014-02-115-26/+248
|\ \ | | | | | | Handle `core.autocrlf=input` when checking out
| * | core.autocrlf=input w/ text=auto attr to workdirEdward Thomson2014-02-091-1/+7
| | |
| * | Tests for crlf filtering into the repositoryEdward Thomson2014-02-091-0/+136
| | |
| * | Tests for core.autocrlf and .gitattributesEdward Thomson2014-02-093-25/+104
| | |
| * | Close files on file diff failureEdward Thomson2014-02-091-0/+1
| | | | | | | | | | | | | | | Not closing the files on a diff failure ensures that clar cleanup will fail on win32 because we still have the file open.
View Lorry Controller Status