summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure submodule repos and indices are freedignore-submodules-in-stashBen Straub2013-09-301-4/+16
| | | | ...before the helper's cleanup method tries to delete their files.
* Test that submodules don't affect stashingJustin Spahr-Summers2013-09-274-43/+117
|
* Never consider submodules for stashingJustin Spahr-Summers2013-09-271-2/+6
|
* Why are we disabling redirects?Ben Straub2013-09-251-0/+3
|
* Merge pull request #1877 from libgit2/win32-redirectsBen Straub2013-09-251-124/+192
|\ | | | | Win32: handle http->https redirects
| * Win32: handle http->https redirectsBen Straub2013-09-251-124/+192
| |
* | Merge pull request #1876 from arrbee/fix-error-handling-docsVicent Martí2013-09-251-62/+221
|\ \ | | | | | | Bring error handling docs up to date
| * | The error handling docs are out of dateRussell Belfer2013-09-251-62/+221
|/ / | | | | | | | | | | | | | | The error handling docs date back to the early error redesign work and don't match up with the route we actually took. This brings them in line with actual practice both for external users and internal implementors, and notes some of the exceptions and possible bugs.
* | Merge pull request #1875 from ethomson/refdb_not_odbVicent Martí2013-09-251-2/+2
|\ \ | | | | | | That's the refdb, it's not the odb...
| * | That's the refdb, it's not the odb...Edward Thomson2013-09-251-2/+2
| | |
* | | Merge pull request #1873 from mikeando/doc_cleanupVicent Martí2013-09-251-94/+95
|\ \ \ | | | | | | | | Cleaned up some tables in checkout-internals doc
| * | | Cleaned up some tables in checkout-internals docMike Anderson2013-09-251-94/+95
| | | | | | | | | | | | | | | | The markdown wasn't rendering correctly.
* | | | Merge pull request #1874 from mikeando/doc_cleanup2Vicent Martí2013-09-251-31/+35
|\ \ \ \ | | | | | | | | | | Fixed formatting of diff-internals.md
| * | | | Fixed formatting of diff-internals.mdMike Anderson2013-09-251-31/+35
|/ / / / | | | | | | | | Indentation for lists was not working correctly.
* | | | Merge pull request #1872 from libgit2/config-isolate-xdgVicent Martí2013-09-241-9/+14
|\ \ \ \ | |_|_|/ |/| | | Make tests pass if XDG config exists
| * | | Make tests pass if XDG config existsRussell Belfer2013-09-241-9/+14
|/ / /
* | | Merge pull request #1871 from libgit2/cross-protocol-redirects-altVicent Martí2013-09-243-62/+113
|\ \ \ | | | | | | | | Alternative fix for cross protocol redirects
| * | | Prevent HTTPS to HTTP redirectRussell Belfer2013-09-241-1/+6
| | | |
| * | | Disconnect path string to preserve after redirectRussell Belfer2013-09-243-79/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subtransport path was relying on pointing to data owned by the remote which meant that after a redirect, the updated path was getting lost for future requests. This updates the http transport to strdup the path and maintain its own lifetime. This also pulls responsibility for parsing the URL back into the http transport and isolates the functions that parse and free that connection data so that they can be reused between the initial parsing and the redirect parsing.
| * | | Properly parse urls that include protocol://Ben Straub2013-09-241-1/+4
| | | |
| * | | Allow redirects to use same hostBen Straub2013-09-241-2/+15
| | |/ | |/|
* | | Merge pull request #1869 from ethomson/fs_iterator_race_2Vicent Martí2013-09-241-1/+9
|\ \ \ | |/ / |/| | Ignore files that disappear while iterating
| * | Ignore files that disappear while iteratingEdward Thomson2013-09-241-1/+9
|/ / | | | | | | | | | | On occasion, files can disappear while we're iterating the filesystem, between calls to readdir and stat. Let's pretend those didn't exist in the first place.
* | Merge pull request #1865 from arrbee/various-cleanupsVicent Martí2013-09-2414-41/+83
|\ \ | | | | | | Various warning cleanup and minor fixes
| * | Fix up filebuf tests a bitRussell Belfer2013-09-241-5/+5
| | |
| * | Fix incorrect return code in crlf filterRussell Belfer2013-09-245-18/+47
| | | | | | | | | | | | | | | | | | The git_buf_text_gather_stats call returns a boolean indicating if the file looks like binary data. That shouldn't be an error; it should be used to skip CRLF processing though.
| * | Fix warnings in Makefile.embedRussell Belfer2013-09-231-1/+1
| | |
| * | Clean up unnecessary git_buf_printf callsRussell Belfer2013-09-232-4/+7
| | | | | | | | | | | | | | | | | | This replaces some git_buf_printf calls with simple calls to git_buf_put instead. Also, it fixes a missing va_end inside the git_buf_vprintf implementation.
| * | Fix warnings on Windows 64-bit buildRussell Belfer2013-09-232-4/+12
| | |
| * | Clean up newly introduced warningsRussell Belfer2013-09-233-9/+11
| |/ | | | | | | | | | | | | | | | | | | The attempt to "clean up warnings" seems to have introduced some new warnings on compliant compilers. This fixes those in a way that I suspect will also be okay for the non-compliant compilers. Also this fixes what appears to be an extra semicolon in the repo initialization template dir handling (and as part of that fix, handles the case where an error occurs correctly).
* | Merge pull request #1864 from libgit2/minimize-regex-usageVicent Martí2013-09-242-58/+29
|\ \ | | | | | | Minimize regex usage
| * | Remove regex usage from places that don't need itRussell Belfer2013-09-232-58/+29
| |/ | | | | | | | | | | | | | | | | | | | | In revwalk, we are doing a very simple check to see if a string contains wildcard characters, so a full regular expression match is not needed. In remote listing, now that we have git_config_foreach_match with full regular expression matching, we can take advantage of that and eliminate the regex here, replacing it with much simpler string manipulation.
* | Merge pull request #1867 from ethomson/remove_not_deleteRussell Belfer2013-09-243-3/+3
|\ \ | |/ |/| 'del' instead of 'delete' for the poor C++ users
| * 'del' instead of 'delete' for the poor C++ usersEdward Thomson2013-09-243-3/+3
|/
* Merge pull request #1863 from linquize/typoVicent Martí2013-09-222-2/+2
|\ | | | | Fix typo in documentation
| * Fix typo in documentationLinquize2013-09-222-2/+2
| |
* | merge: reverse array and length parameter orderCarlos Martín Nieto2013-09-223-6/+6
|/ | | | Make it pair up with the one for commits. This fixes #1691.
* Merge pull request #1840 from linquize/warningVicent Martí2013-09-2110-18/+18
|\ | | | | Fix warning
| * Fix warningLinquize2013-09-1910-18/+18
| |
* | Merge pull request #1861 from ben/molo-valgrindVicent Martí2013-09-201-0/+28
|\ \ | | | | | | OSX 10.8 + Valgrind
| * | Suppress noise from running Valgrind on OSX 10.8Ben Straub2013-09-191-0/+28
| | |
* | | Merge pull request #1859 from linquize/init.templatedirVicent Martí2013-09-201-18/+13
|\ \ \ | |/ / |/| | Make init.templatedir work
| * | Check error value from git_futils_find_template_dirLinquize2013-09-201-2/+2
| | |
| * | Make init.templatedir workLinquize2013-09-191-17/+12
| | |
* | | msvc: No void* arithmetic on WindowsVicent Marti2013-09-181-1/+1
| | |
* | | Merge pull request #1860 from libgit2/cmn/indexer-hashVicent Martí2013-09-171-19/+71
|\ \ \ | |/ / |/| | indexer: check the packfile trailer
| * | indexer: don't reiterate the class in the messageCarlos Martín Nieto2013-09-181-3/+3
| | |
| * | indexer: check the packfile trailer for correctnessCarlos Martín Nieto2013-09-181-17/+69
| | | | | | | | | | | | | | | The packfile trailer gets sent over and we should check whether it's correct as part of our sanity checks of the packfile.
* | | Merge pull request #1858 from linquize/win32-template-dirVicent Martí2013-09-177-20/+77
|\ \ \ | | | | | | | | Configurable template dir for Win32
| * | | Can load default template directoryLinquize2013-09-183-5/+24
| | | |
View Lorry Controller Status