summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * fix build on FreeBSDFraser Tweedale2012-11-261-0/+4
|/ | | | | | | 3f9eb1e introduced support for SSL certificates issued for IP addresses, making use of in_addr and in_addr6 structs. On FreeBSD these are defined in (a file included in) <netinet/in.h>, so include that file on FreeBSD and get the build working again.
* Merge pull request #1101 from csware/prevent_dieVicent Martí2012-11-261-2/+4
|\ | | | | pack.c: Set p->mwf.fd to -1 on error
| * Set p->mwf.fd to -1 on errorSven Strickroth2012-11-241-2/+4
| | | | | | | | | | | | If p->mwf.fd is e.g. -2 then it is closed in packfile_free and an exception might be thrown. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | Merge pull request #1105 from delanne/invalid_read_config_fileVicent Martí2012-11-261-1/+1
|\ \ | |/ |/| Fix invalid read reported by valgrind
| * Fix invalid read reported by valgrinddelanne2012-11-261-1/+1
|/
* Merge pull request #1097 from nulltoken/topic/head_tree_errorVicent Martí2012-11-236-58/+74
|\ | | | | Make `git_repository_head_tree()` return error codes
| * repo: Make git_repository_head_tree() return error codesnulltoken2012-11-225-55/+71
| |
| * test: Minor fixesnulltoken2012-11-221-4/+4
| |
* | Merge pull request #1093 from libgit2/contributingVicent Martí2012-11-233-107/+210
|\ \ | | | | | | Create contributing guidelines
| * | Rewrite conventions to be more completeBen Straub2012-11-211-65/+121
| | |
| * | Markdownize CONVENTIONSBen Straub2012-11-202-9/+9
| | |
| * | Add contributing guidelinesBen Straub2012-11-201-0/+47
| | |
* | | Merge pull request #1098 from scunz/cleanup_in_cleanupVicent Martí2012-11-2353-15/+153
|\ \ \ | | | | | | | | Reset all static variables to NULL in clar's __cleanup
| * | | Reset all static variables to NULL in clar's __cleanupSascha Cunz2012-11-2353-15/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, any failed assertion in the second (or a later) test inside a test suite has a chance of double deleting memory, resulting in a heap corruption. See #1096 for details. This leaves alone the test cases where we "just" use cl_git_sandbox_init() and cl_git_sandbox_cleanup(). These methods already take good care to not double delete a repository. Fixes #1096
* | | | Merge pull request #1100 from martinwoodward/fuckityfuckEdward Thomson2012-11-237-16/+16
|\ \ \ \ | |/ / / |/| | | Remove use of English expletives
| * | | Remove use of English expletivesMartin Woodward2012-11-237-16/+16
|/ / / | | | | | | | | | | | | | | | Remove words such as fuck, crap, shit etc. Remove other potentially offensive words from comments. Tidy up other geopolicital terms in comments.
* | | Call git_remote_update_tips before git_remote_disconnectPhilip Kelley2012-11-221-2/+1
| | |
* | | Merge pull request #1095 from martinwoodward/authorsPhilip Kelley2012-11-222-1/+4
|\ \ \ | |_|/ |/| | Update to Authors
| * | Add new email address for Nicolas PitreMartin Woodward2012-10-251-1/+1
| | | | | | | | | See https://github.com/git/git/commit/03aa8ff3be3b35522b2e378651e65e0e86778018, Nicolas Pitre's email address has changed to nico@fluxnic.net
| * | Add Dmitry Kakurin to hall of fameMartin Woodward2012-10-251-0/+1
| | | | | | | | | | | | | | | | | | See lines 59-60 from https://github.com/libgit2/libgit2/blob/44b1ff4c1209c34360cc0c43761c40f5f5020886/src/filter.c which contain a couple of lines of code to ignore an EOF at the end of a file when detecting if it is a text file or not. These came from this contribution that Dmitry made to core Git back in 2008 (https://github.com/git/git/commit/f9dd4bf4e58af0b4828c7e7013080dba59f8a6b9) which was committed by Junio. Dmitry gave his permission for these changes to be included in LibGit2 as well via email to vmg and myself
| * | Add Holger Weiss to hall of fameMartin Woodward2012-10-252-0/+2
| | | | | | | | | | | | Permission obtained from Holger Weiss to include all of his contributions to Git into LibGit2. See https://github.com/git/git/commit/21e403a7b956a95a36f218439f82b1c8af869257
* | | Merge pull request #1092 from arrbee/legal-to-not-have-gitconfigRussell Belfer2012-11-202-19/+28
|\ \ \ | | | | | | | | It is okay to not have a .gitconfig file
| * | | Need to clear ignored error from config loadRussell Belfer2012-11-201-0/+2
| | | |
| * | | It is okay to not have a .gitconfig fileRussell Belfer2012-11-202-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | Opening a repo is generating an error if you don't have a .gitconfig file in your home directory, but that should be legal.
* | | | Merge pull request #1089 from edubart/fix_win32_lstatRussell Belfer2012-11-202-51/+15
|\ \ \ \ | |/ / / |/| | | Fix win32 lstat
| * | | Minor optimization in win32 do_lstatEduardo Bart2012-11-201-3/+2
| | | |
| * | | Update clar tests p_lstat_posixly and p_lstatEduardo Bart2012-11-201-28/+8
| | | |
| * | | update win32 lstat commentEduardo Bart2012-11-191-5/+2
| | | |
| * | | Fix win32 lstatEduardo Bart2012-11-191-19/+7
|/ / /
* | | Merge pull request #1086 from scunz/vs_warning_levelRussell Belfer2012-11-191-1/+1
|\ \ \ | | | | | | | | VS-Build: Append C_FLAGS to the end of the already given ones.
| * | | VS-Build: Disable /W4 parameter, as it is not picked up anywaySascha Cunz2012-11-191-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My other PR revealed, that the /W4 parameter, we give to MSVC is ignored because cmake set CMAKE_C_FLAGS already to /W3 and we overwrite it. The command line tools gave me a D9025 warning for this on every file and looking into the project properties page on MSVC 2008 tells, that it has the warning level set to /W3. However, the warnings introduced by /W4 are far to useless for having them enabled. So just disable them.
* | | Merge pull request #1085 from scunz/no_pch_for_nmakeRussell Belfer2012-11-191-2/+2
|\ \ \ | |/ / |/| | Don't use precompiled headers for command-line based VC builds.
| * | Don't use precompiled headers for command-line based VC builds.Sascha Cunz2012-11-191-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | The reason, why libgit2 currently cannot support compiling via the command-line tools cl/nmake from WinSDK and/or Microsoft Visual Studio, seems to be a missing dependency on the generated precompiled header file. The Visual Studio IDE automatically inserts this dependency when it sees the right combination of "/Y" parameters. This patch allows to compile using command line tools by disabling precompiled headers for NON-IDE builds.
* | Merge pull request #1084 from libgit2/filename-validationVicent Martí2012-11-183-1/+39
|\ \ | | | | | | Filename validation
| * | Add a test for invalid filenames while writing tree from indexfilename-validationScott J. Goldman2012-11-181-0/+27
| | |
| * | Catch invalid filenames in append_entry()Scott J. Goldman2012-11-181-0/+3
| | | | | | | | | | | | | | | This prevents the index api from calling write_tree() with a bogus tree.
| * | Prevent creating `..`, `.`, and `.git` with tree builderScott J. Goldman2012-11-182-1/+9
|/ / | | | | | | As per core git.
* | Merge pull request #1082 from scunz/fixDoubleDeleteOnErrorVicent Martí2012-11-181-2/+3
|\ \ | | | | | | Indexer: Avoid a possible double-deletion in error case
| * | Indexer: Avoid a possible double-deletion in error caseSascha Cunz2012-11-181-2/+3
|/ /
* | Fix a couple of warningsMichael Schubert2012-11-183-4/+3
| |
* | Merge pull request #1077 from nulltoken/fix/apinulltoken2012-11-1724-119/+260
|\ \ | | | | | | Itsy bitsy tiny winy minor api related fixes
| * | reflog: make entry_byindex() and drop() git compliantnulltoken2012-11-177-39/+51
| | | | | | | | | | | | | | | Passing 0 as the index now retrieves the most recent entry instead of the oldest one.
| * | reflog: Fix documentationnulltoken2012-11-171-1/+2
| | |
| * | config: Opening a nonexistent file returns ENOTFOUNDnulltoken2012-11-175-12/+69
| | |
| * | config: Make git_config_file__ondisk() internalnulltoken2012-11-172-13/+13
| | |
| * | repo: ensure is_empty() checks there are no refsnulltoken2012-11-173-29/+50
| | |
| * | tests: introduce cl_git_remove_placeholders()nulltoken2012-11-172-0/+52
| | |
| * | repo: readonly tests don't need a sandboxed reponulltoken2012-11-171-11/+1
| | |
| * | env: ensure git_futils_find_xxx() returns ENOTFOUNDnulltoken2012-11-171-8/+16
| | |
| * | tag: rename git_tag_type to git_tag_target_typenulltoken2012-11-174-4/+4
| | |