summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Solaris doesn't necessarily have stdint.h, use inttypes.hJacques Germishuys2014-08-051-0/+2
|/ /
* | Merge pull request #2487 from libgit2/cmn/revwalk-no-preallocVicent Marti2014-07-252-4/+1
|\ \ | | | | | | Work around strict aliasing in array growth
| * | array: mark the array to grow as volatilecmn/revwalk-no-preallocCarlos Martín Nieto2014-07-251-1/+1
| | | | | | | | | | | | | | | | | | This works around strict aliasing rules letting some versions of GCC (particularly on RHEL 6) thinking that they can skip updating the size of the array when calculating the next element's offset.
| * | revwalk: remove preallocation of the uninteresting commitsCarlos Martín Nieto2014-07-241-3/+0
|/ / | | | | | | | | | | | | | | | | | | Preallocating two commits doesn't make much sense as leaving allocation to the first array usage will allocate a sensible size with room for growth. This preallocation has also been hiding issues with strict aliasing in the tests, as we have fairly simple histories and never trigger the growth.
* | Merge pull request #2477 from ethomson/mergeVicent Marti2014-07-231-2/+1
|\ \ | | | | | | Don't allow conflicts by default
| * | Don't allow conflicts by defaultEdward Thomson2014-07-171-2/+1
| | |
* | | Merge pull request #2484 from libgit2/fix-git-status-list-new-unreadable-folderVicent Marti2014-07-2312-32/+189
|\ \ \ | | | | | | | | Fix git status list new unreadable folder
| * | | undo indentation change in diff_print.cfix-git-status-list-new-unreadable-folderAlan Rogers2014-07-231-9/+9
| | | |
| * | | Merge remote-tracking branch 'origin/master' into ↵Alan Rogers2014-07-22125-1297/+2895
| |\ \ \ | | |/ / | | | | | | | | fix-git-status-list-new-unreadable-folder
| * | | Remove debug printfs.Alan Rogers2014-07-221-2/+0
| | | |
| * | | Move the UNREADABLE enums to the correct group.Alan Rogers2014-07-221-6/+6
| | | |
| * | | Merge remote-tracking branch 'origin/development' into ↵Alan Rogers2014-07-1026-246/+500
| |\ \ \ | | | | | | | | | | | | | | | fix-git-status-list-new-unreadable-folder
| * | | | Whitespace wibbles.Alan Rogers2014-06-042-6/+7
| | | | |
| * | | | Merge remote-tracking branch 'origin/development' into ↵Alan Rogers2014-06-04115-846/+2544
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-status-list-new-unreadable-folder Conflicts: include/git2/diff.h
| * | | | | Clear out the struct.Alan Rogers2014-06-041-0/+1
| | | | | |
| * | | | | Add another test for unreadable and not included.Alan Rogers2014-06-041-0/+32
| | | | | |
| * | | | | Implement GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKEDAlan Rogers2014-06-041-1/+4
| | | | | |
| * | | | | GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKEDAlan Rogers2014-06-032-1/+6
| | | | | |
| * | | | | Add GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKEDAlan Rogers2014-06-032-17/+52
| | | | | | | | | | | | | | | | | | | | | | | | and a (failing) test for it.
| * | | | | Fix the no permissions test.Alan Rogers2014-05-301-3/+2
| | | | | |
| * | | | | Use 'X' for unreadable status.Alan Rogers2014-05-301-0/+3
| | | | | |
| * | | | | Add GIT_STATUS_OPT_INCLUDE_UNREADABLEAlan Rogers2014-05-302-0/+3
| | | | | |
| * | | | | Remove GIT_FILEMODE_NEW as it's unused.Alan Rogers2014-05-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | And use 0 for GIT_FILEMODE_UNREADABLE.
| * | | | | We do expect the foo path in the nopermissions testAlan Rogers2014-05-231-2/+2
| | | | | |
| * | | | | Don't need to duplicate this code.Alan Rogers2014-05-231-5/+1
| | | | | |
| * | | | | Try a value for UNREADABLE that won't get masked out?!Alan Rogers2014-05-231-1/+1
| | | | | |
| * | | | | Return GIT_DELTA_UNREADABLE for a file with a mode changeAlan Rogers2014-05-221-0/+5
| | | | | |
| * | | | | Remove errant newlineAlan Rogers2014-05-221-1/+0
| | | | | |
| * | | | | Simplify the no permission test.Alan Rogers2014-05-211-6/+4
| | | | | |
| * | | | | Remove errant whitespace.Alan Rogers2014-05-211-1/+1
| | | | | |
| * | | | | Return GIT_FILEMODE_UNREADABLE for files that fail to stat.Alan Rogers2014-05-214-19/+25
| | | | | |
| * | | | | Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.Alan Rogers2014-05-208-19/+52
| | | | | |
| * | | | | Skip unreadable files for now.Alan Rogers2014-05-202-5/+9
| | | | | |
| * | | | | Rename GIT_ENOACCESS -> GIT_EUNREADABLEAlan Rogers2014-05-202-8/+5
| | | | | |
| * | | | | Skip unreadable files for now.Alan Rogers2014-05-152-4/+6
| | | | | |
| * | | | | Return a specific error for EACCES.Alan Rogers2014-05-152-0/+5
| | | | | |
| * | | | | Simplify the test.Alan Rogers2014-05-151-10/+5
| | | | | |
| * | | | | Add a test (failing) for a work tree status.Alan Rogers2014-05-141-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When thees is an unreadable folder, we should still be able to enumerate status.
* | | | | | Merge pull request #2485 from ethomson/cherrypickVicent Marti2014-07-228-88/+88
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Rename git_cherry_pick to git_cherrypick
| * | | | | git_cherry_pick -> git_cherrypickEdward Thomson2014-07-228-88/+88
|/ / / / /
* | | | | Merge pull request #2475 from libgit2/expose-buffer-binary-detectionVicent Marti2014-07-162-0/+27
|\ \ \ \ \ | | | | | | | | | | | | Export git_buf_text_is_binary and git_buf_text_contains_nul.
| * | | | | Just put it all in buffer.joshaber2014-07-166-46/+45
| | | | | |
| * | | | | Export git_buf_text_is_binary and git_buf_text_contains_nul.expose-buffer-binary-detectionjoshaber2014-07-154-18/+46
| | | | | | | | | | | | | | | | | | | | | | | | So that users don’t need to implement binary detection themselves.
* | | | | | Merge pull request #2476 from linquize/config-lf-eofVicent Marti2014-07-162-3/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | When adding new config section, handle config file not ending with LF
| * | | | | | Add unit test to test add section without lf at EOFLinquize2014-07-161-0/+16
| | | | | | |
| * | | | | | Make sure \n is at the end of config file before a new section is writtenLinquize2014-07-161-3/+3
| |/ / / / /
* | | | | | ssh: Fix unused warningVicent Marti2014-07-161-0/+1
| | | | | |
* | | | | | clone: should_clone? Of course we should clone. That's not the questionVicent Marti2014-07-161-4/+4
| | | | | |
* | | | | | Merge pull request #2467 from ethomson/win_local_cloneVicent Marti2014-07-164-60/+93
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Handle local file:/// paths on Windows
| * | | | | Handle local file:/// paths on WindowsEdward Thomson2014-07-114-60/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows can't handle a path like `/c:/foo`; when turning file:/// URIs into local paths, we must strip the leading slash.