summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* repository: parse init.templatedir as a pathcmn/template-pathCarlos Martín Nieto2015-02-061-1/+2
| | | | | This is a path so we must use the path getter so we get the tilde expansion done.
* Merge pull request #2881 from ethomson/clarEdward Thomson2015-02-051-0/+5
|\ | | | | Update clar to d17c7f6
| * Update clar to d17c7f6Edward Thomson2015-02-051-0/+5
|/
* Merge pull request #2867 from ethomson/8dot3Edward Thomson2015-02-055-1/+34
|\ | | | | Handle 8dot3 filenames being disabled on Win32
| * win32: further cleanups for 8.3 disablingEdward Thomson2015-02-034-9/+30
| |
| * win32: cleanup 8.3 disabled testsEdward Thomson2015-02-033-40/+16
| |
| * Fix test failures when 8.3 is disabledLinquize2015-01-313-5/+41
| |
* | Merge pull request #2875 from JIghtuse/masterEdward Thomson2015-02-051-0/+3
|\ \ | | | | | | for-each-ref example: initialize libgit2 in main
| * | for-each-ref example: init/shutdown libgit2 in mainBoris Egorov2015-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | I don't get how it was working without git_libgit2_init() call. I run it and libgit2 throws assertion somewhere in its internals. Now it works. Updated commit with shutdown at the end.
* | | Merge pull request #2872 from ethomson/pedanticEdward Thomson2015-02-043-99/+1
|\ \ \ | | | | | | | | Fixes for pedantry
| * | | hash_generic: __extension__ keyword for pedantryEdward Thomson2015-02-041-1/+1
| | | |
| * | | bswap: remove unused bswapEdward Thomson2015-02-032-98/+0
| | | |
* | | | Merge pull request #2874 from modocache/add-giftEdward Thomson2015-02-041-0/+2
|\ \ \ \ | | | | | | | | | | README.md: Add Swift bindings "Gift"
| * | | | README.md: Add Swift bindings "Gift"Brian Gesiak2015-02-041-0/+2
| | |/ / | |/| |
* | | | Merge pull request #2873 from ethomson/structinitCarlos Martín Nieto2015-02-041-1/+1
|\ \ \ \ | |/ / / |/| | | structinit test: use %PRIuZ instead of %d for size_t
| * | | structinit test: use %PRIuZ instead of %d for size_tEdward Thomson2015-02-041-1/+1
|/ / /
* | | Merge pull request #2870 from urkud/log-libssh-not-foundEdward Thomson2015-02-031-0/+2
|\ \ \ | | | | | | | | Tell user if libssh was not found
| * | | Tell user if libssh was not foundYury G. Kudryashov2015-02-041-0/+2
| | | | | | | | | | | | | | | | Fixes #2665
* | | | Merge pull request #2861 from libgit2/ntk/appveyorEdward Thomson2015-02-031-6/+1
|\ \ \ \ | |_|/ / |/| | | AppVeyor: Prettify build script
| * | | AppVeyor: Prettify build scriptntk/appveyornulltoken2015-01-311-6/+1
| |/ /
* | | Merge pull request #2868 from ethomson/diff_docCarlos Martín Nieto2015-02-032-9/+6
|\ \ \ | |/ / |/| | diff docs: update `git_diff_delta` description
| * | diff docs: update `git_diff_delta` descriptionEdward Thomson2015-02-032-9/+6
|/ /
* | Merge pull request #2832 from ethomson/appveyor_badgeEdward Thomson2015-01-302-7/+43
|\ \ | | | | | | 64-bit Appveyor Builds
| * | structinit test: only run on DEBUG buildsEdward Thomson2015-01-211-1/+16
| | | | | | | | | | | | | | | | | | | | | The structinit tests don't make sense unless structure padding is uniformly initialized, which is unlikely to happen on release builds. Only enable them for DEBUG builds. Further, rename them to core::structinit.
| * | structinit test: show which byte differsEdward Thomson2015-01-211-5/+20
| | |
| * | Windows CI: use 32 and 64 bit for AppVeyor buildsEdward Thomson2015-01-211-1/+7
| | | | | | | | | | | | | | | Add 64 bit and always build with default calling conventions, to avoid trying to build with stdcall on amd64.
* | | Merge pull request #2853 from swisspol/empty_docCarlos Martín Nieto2015-01-301-2/+2
|\ \ \ | |_|/ |/| | Clarified git_repository_is_empty() documentation
| * | Clarified git_repository_is_empty() documentationPierre-Olivier Latour2015-01-271-2/+2
|/ /
* | Merge pull request #2819 from libgit2/cmn/config-get-pathEdward Thomson2015-01-264-0/+123
|\ \ | | | | | | config: add parsing and getter for paths
| * | config: add parsing and getter for pathscmn/config-get-pathCarlos Martín Nieto2015-01-144-0/+123
| | |
* | | Merge pull request #2837 from swisspol/set_indexEdward Thomson2015-01-261-1/+1
|\ \ \ | | | | | | | | Allow passing a NULL index to git_repository_set_index()
| * | | Allow passing a NULL index to git_repository_set_index()Pierre-Olivier Latour2015-01-231-1/+1
| | |/ | |/| | | | | | | | | | | | | This is supported by the underlying set_index() implementation and setting the repository index to NULL is recommended by the git_repository_set_bare() documentation.
* | | Merge pull request #2839 from swisspol/typoEdward Thomson2015-01-261-1/+1
|\ \ \ | | | | | | | | Fixed typo in git_repository_reinit_filesystem() documentation
| * | | Fixed typo in git_repository_reinit_filesystem() documentationPierre-Olivier Latour2015-01-231-1/+1
| |/ /
* | | Merge pull request #2847 from jacquesg/coverityEdward Thomson2015-01-263-1/+8
|\ \ \ | | | | | | | | More coverity fixes
| * | | Ensure the diff hunk callback is specified before trying to dereference itJacques Germishuys2015-01-251-1/+2
| | | |
| * | | Return early if allocating a git_pathspec_match_list failedJacques Germishuys2015-01-251-0/+3
| | | |
| * | | Ensure git_index_entry is not NULL before trying to free itJacques Germishuys2015-01-251-0/+3
| | | |
* | | | Merge pull request #2840 from swisspol/sys_repository_includeEdward Thomson2015-01-261-0/+3
|\ \ \ \ | | | | | | | | | | Make sure sys/repository.h includes the required headers
| * | | | Make sure sys/repository.h includes the required headersPierre-Olivier Latour2015-01-231-0/+3
| | |/ / | |/| | | | | | | | | | | | | | It was missing "common.h" and "types.h" like other system headers. This generated compilation errors if including it directly.
* | | | Merge pull request #2841 from swisspol/set_bareEdward Thomson2015-01-261-1/+1
|\ \ \ \ | | | | | | | | | | Fixed git_repository_set_bare() not setting "core.bare" correctly
| * | | | Fixed git_repository_set_bare() not setting "core.bare" correctlyPierre-Olivier Latour2015-01-231-1/+1
| |/ / /
* | | | Merge pull request #2844 from rakuco/netinet-include-fixesEdward Thomson2015-01-261-0/+3
|\ \ \ \ | | | | | | | | | | openssl: Add all required includes for AF_INET6 and in6_addr.
| * | | | openssl: Add all required includes for AF_INET6 and in6_addr.Raphael Kubo da Costa2015-01-241-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the build at least on FreeBSD, where those types were not defined indirectly: src/openssl_stream.c:100:18: error: variable has incomplete type 'struct in6_addr' struct in6_addr addr6; ^ src/openssl_stream.c:100:9: note: forward declaration of 'struct in6_addr' struct in6_addr addr6; ^ src/openssl_stream.c:111:18: error: use of undeclared identifier 'AF_INET' if (p_inet_pton(AF_INET, host, &addr4)) { ^ src/unix/posix.h:31:40: note: expanded from macro 'p_inet_pton' ^ src/openssl_stream.c:115:18: error: use of undeclared identifier 'AF_INET6' if(p_inet_pton(AF_INET6, host, &addr6)) { ^ src/unix/posix.h:31:40: note: expanded from macro 'p_inet_pton' ^
* | | | Merge pull request #2848 from JIghtuse/describe_mem_fixEdward Thomson2015-01-261-2/+4
|\ \ \ \ | | | | | | | | | | describe example: fix memory allocation size
| * | | | describe example: fix memory allocation sizeBoris Egorov2015-01-251-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | We need to allocate memory for sizeof(char *) * ncommits, not just for ncommits. Issue detected by GCC's AddressSanitizer.
* | | | Merge pull request #2846 from JIghtuse/masterCarlos Martín Nieto2015-01-261-0/+3
|\ \ \ \ | |/ / / |/| | | pathspec: do not try to dereference NULL
| * | | pathspec: do not try to dereference NULLBoris Egorov2015-01-251-0/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pathspec_match_free() should not dereference a NULL passed to it. I found this issue when I tried to run example log program with nonexistent branch: ./example/log help Such call leads to segmentation fault.
* | | Merge pull request #2834 from ethomson/memleakEdward Thomson2015-01-221-0/+1
|\ \ \ | |/ / |/| | checkout: free last created directory
| * | checkout: free last created directoryEdward Thomson2015-01-231-0/+1
|/ /