Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | undo indentation change in diff_print.cfix-git-status-list-new-unreadable-folder | Alan Rogers | 2014-07-23 | 1 | -9/+9 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into ↵ | Alan Rogers | 2014-07-22 | 125 | -1297/+2895 |
|\ | | | | | | | fix-git-status-list-new-unreadable-folder | ||||
| * | Merge pull request #2475 from libgit2/expose-buffer-binary-detection | Vicent Marti | 2014-07-16 | 2 | -0/+27 |
| |\ | | | | | | | Export git_buf_text_is_binary and git_buf_text_contains_nul. | ||||
| | * | Just put it all in buffer. | joshaber | 2014-07-16 | 6 | -46/+45 |
| | | | |||||
| | * | Export git_buf_text_is_binary and git_buf_text_contains_nul.expose-buffer-binary-detection | joshaber | 2014-07-15 | 4 | -18/+46 |
| | | | | | | | | | | | | So that users don’t need to implement binary detection themselves. | ||||
| * | | Merge pull request #2476 from linquize/config-lf-eof | Vicent Marti | 2014-07-16 | 2 | -3/+19 |
| |\ \ | | | | | | | | | When adding new config section, handle config file not ending with LF | ||||
| | * | | Add unit test to test add section without lf at EOF | Linquize | 2014-07-16 | 1 | -0/+16 |
| | | | | |||||
| | * | | Make sure \n is at the end of config file before a new section is written | Linquize | 2014-07-16 | 1 | -3/+3 |
| | |/ | |||||
| * | | ssh: Fix unused warning | Vicent Marti | 2014-07-16 | 1 | -0/+1 |
| | | | |||||
| * | | clone: should_clone? Of course we should clone. That's not the question | Vicent Marti | 2014-07-16 | 1 | -4/+4 |
| | | | |||||
| * | | Merge pull request #2467 from ethomson/win_local_clone | Vicent Marti | 2014-07-16 | 4 | -60/+93 |
| |\ \ | | |/ | |/| | Handle local file:/// paths on Windows | ||||
| | * | Handle local file:/// paths on Windows | Edward Thomson | 2014-07-11 | 4 | -60/+93 |
| | | | | | | | | | | | | | | | Windows can't handle a path like `/c:/foo`; when turning file:/// URIs into local paths, we must strip the leading slash. | ||||
| * | | Merge pull request #2472 from jacquesg/perl-link | Vicent Marti | 2014-07-15 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Update perl bindings link | ||||
| | * | | Updated perl bindings link | Jacques Germishuys | 2014-07-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2474 from ethomson/clar_file_report | Vicent Marti | 2014-07-15 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | Switch description and message reporting in `clar__assert_equal_file` | ||||
| | * | | Switch description and path reporting | Edward Thomson | 2014-07-15 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2466 from jacquesg/win2003-platform-sdk | Vicent Marti | 2014-07-11 | 7 | -8/+23 |
| |\ \ | | | | | | | | | Windows compatibility fixes | ||||
| | * | | Define IO_REPARSE_TAG_SYMLINK if its not defined by WinNT.h | Jacques Germishuys | 2014-07-06 | 1 | -0/+4 |
| | | | | |||||
| | * | | Secure CRT is only available from Visual Studio 2005+ | Jacques Germishuys | 2014-07-06 | 2 | -3/+3 |
| | | | | |||||
| | * | | qsort_r is only available from Visual Studio 2005+ | Jacques Germishuys | 2014-07-06 | 1 | -1/+2 |
| | | | | |||||
| | * | | Variadic macros is only available from Visual Studio 2005+ | Jacques Germishuys | 2014-07-06 | 2 | -2/+10 |
| | | | | |||||
| | * | | _stat64 is a function, __stat64 is the structure | Jacques Germishuys | 2014-07-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | strnlen() is only available from Visual Studio 2005+ | Jacques Germishuys | 2014-07-06 | 1 | -1/+2 |
| | | | | |||||
| | * | | in_addr is defined in <Winsock2.h>, include before <ws2tcpip.h> | Jacques Germishuys | 2014-07-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #2463 from libgit2/cmn/ssh-factory-for-paths | Vicent Marti | 2014-07-11 | 5 | -3/+141 |
| |\ \ \ | | | | | | | | | | | ssh: provide a factory function for setting ssh paths | ||||
| | * | | | ssh: provide a factory function for setting ssh pathscmn/ssh-factory-for-paths | Carlos Martín Nieto | 2014-07-07 | 5 | -3/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git allows you to set which paths to use for the git server programs when connecting over ssh; and we want to provide something similar. We do this by providing a factory function which can be set as the remote's transport callback which will set the given paths upon creation. | ||||
| * | | | | Merge pull request #2465 from libgit2/cmn/refspec-start-middle | Vicent Marti | 2014-07-11 | 3 | -18/+68 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Support refspecs with the asterisk in the middle | ||||
| | * | | | Add a CHANGELOG entry for refspecs with asterisk in the middlecmn/refspec-start-middle | Carlos Martín Nieto | 2014-07-04 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | refspec: support asterisks in the middle of a pattern | Carlos Martín Nieto | 2014-07-04 | 2 | -18/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to assume a refspec would only have an asterisk in the middle of their respective pattern. This has not been a valid assumption for some time now with git. Instead of assuming where the asterisk is going to be, change the logic to treat each pattern as having two halves with a replacement bit in the middle, where the asterisk is. | ||||
| | * | | | refspec: short-circuit non-pattern refspecs on transform | Carlos Martín Nieto | 2014-07-04 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When transforming a non-pattern refspec, we simply need to copy over the opposite string. Move that logic up to the wrapper so we can assume a pattern refspec in the transformation function. | ||||
| * | | | | Merge pull request #2468 from Airbitz/pack-error-reporting | Carlos Martín Nieto | 2014-07-11 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Properly report failure when expanding a packfile | ||||
| | * | | | | Properly report failure when expanding a packfile | William Swanson | 2014-07-09 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #2457 from ethomson/merge_fix | Carlos Martín Nieto | 2014-07-11 | 1 | -3/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | merge: don't open COMMIT_MSG unless we need to append conflicts | ||||
| | * | | | | | merge: don't open COMMIT_MSG unless we need to append conflicts | Edward Thomson | 2014-07-08 | 1 | -3/+4 |
| | |/ / / / | |||||
| * | | | | | checkout: fix docs formatting for the options | Carlos Martín Nieto | 2014-07-11 | 1 | -12/+12 |
| |/ / / / | |||||
| * | | | | Documentation fixes | Carlos Martín Nieto | 2014-07-08 | 2 | -13/+20 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup git_attr_value's comment to be recognised as documentation, and include the definitions needed for clang to parse reset.h such that it shows up in the documentation. This fixes #2430. | ||||
| * | | | Merge remote-tracking branch 'origin/cmn/update-zlib' | Vicent Marti | 2014-07-04 | 15 | -449/+1350 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | zlib: disable warning 4142 on MSVCcmn/update-zlib | Carlos Martín Nieto | 2014-06-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | This is about benign redefinition of types. We're not interested in it. | ||||
| | * | | zlib: get rid of compress.c and uncompr.c | Carlos Martín Nieto | 2014-06-11 | 2 | -139/+0 |
| | | | | |||||
| | * | | zlib: get rid of gz* | Carlos Martín Nieto | 2014-06-11 | 6 | -2042/+0 |
| | | | | |||||
| | * | | zlib: add a few missing defines | Carlos Martín Nieto | 2014-06-11 | 1 | -0/+3 |
| | | | | |||||
| | * | | Merge branch 'cmn/zlib-update' into cmn/update-zlib | Carlos Martín Nieto | 2014-06-11 | 21 | -449/+3527 |
| | |\ \ | |||||
| | | * \ | Merge branch 'cmn/zlib-128' into cmn/zlib-update | Carlos Martín Nieto | 2014-06-11 | 21 | -449/+3527 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: deps/zlib/crc32.c deps/zlib/crc32.h deps/zlib/zconf.h | ||||
| | | | * | | Update zlib to 1.2.8 | Carlos Martín Nieto | 2014-06-11 | 22 | -458/+4502 |
| | | | | | | |||||
| * | | | | | Merge pull request #2461 from jacquesg/ssh2-warnings | Carlos Martín Nieto | 2014-07-04 | 2 | -3/+5 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Fix SSH2 warnings | ||||
| | * | | | | Include libssh2.h before git2.h (transport.h) | Jacques Germishuys | 2014-07-03 | 1 | -2/+4 |
| | | | | | | |||||
| | * | | | | Fix git_cred_ssh_interactive_callback signature | Jacques Germishuys | 2014-07-03 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #2460 from libgit2/cmn/sched-yield | Vicent Marti | 2014-07-03 | 2 | -7/+14 |
| |\ \ \ \ | | | | | | | | | | | | | Move yield to the tests and enable for FreeBSD | ||||
| | * | | | | Move yield to the tests and enable for FreeBSDcmn/sched-yield | Carlos Martín Nieto | 2014-07-03 | 2 | -7/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the definition of git_thread_yield() to the test which needs it and add the correct definition for it for FreeBSD and derivatives. Original patch adding FreeBSD and derivatives by @jacquesg. | ||||
| * | | | | | Merge pull request #2459 from libgit2/cmn/http-url-path | Vicent Marti | 2014-07-03 | 2 | -0/+21 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | netops: error out on url without a path |