| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge pull request #3011 from ethomson/filter_zero_tempbuf | Edward Thomson | 2015-03-25 | 10 | -0/+22 | |
| |\ \ \ \ | | | | | | | | | | | Clear temporary buffer when filtering | |||||
| | * | | | | Illustrate bad checkout on Windows | Jacques Germishuys | 2015-03-25 | 10 | -0/+22 | |
| | | |_|/ | |/| | | ||||||
| * | | | | squash some leaks | Edward Thomson | 2015-03-24 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #2947 from libgit2/cmn/notes-buf | Edward Thomson | 2015-03-24 | 2 | -5/+12 | |
| |\ \ \ \ | |/ / / |/| | | | note: use a git_buf to return the default namespace | |||||
| | * | | | note: use a git_buf to return the default namespacecmn/notes-buf | Carlos Martín Nieto | 2015-03-17 | 2 | -5/+12 | |
| | | |/ | |/| | | | | | | | | | | | | | | | | The caller has otherwise no way to know how long the string will be allocated or ability to free it. This fixes #2944. | |||||
| * | | | Merge pull request #2967 from jacquesg/merge-whitespace | Edward Thomson | 2015-03-18 | 53 | -8/+206 | |
| |\ \ \ | |_|/ |/| | | Allow merges of files (and trees) with whitespace problems/fixes | |||||
| | * | | Collapse whitespace flags into git_merge_file_flags_t | Jacques Germishuys | 2015-03-16 | 2 | -4/+4 | |
| | | | | ||||||
| | * | | Renamed git_merge_options 'flags' to 'tree_flags' | Jacques Germishuys | 2015-03-16 | 4 | -8/+8 | |
| | | | | ||||||
| | * | | Added tests to merge files and branches with whitespace problems and fixes | Jacques Germishuys | 2015-03-16 | 49 | -0/+198 | |
| | | | | ||||||
| * | | | Merge pull request #2993 from ethomson/clar_update | Carlos Martín Nieto | 2015-03-18 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | clar: update to 08f434d | |||||
| | * | | | clar: update to 08f434d | Edward Thomson | 2015-03-17 | 1 | -1/+1 | |
| | | |/ | |/| | ||||||
| * | | | Merge remote-tracking branch 'ethomson/submodule_8dot3' | Carlos Martín Nieto | 2015-03-18 | 1 | -0/+108 | |
| |\ \ \ | ||||||
| | * | | | repository: Introduce "reserved names" | Edward Thomson | 2015-02-27 | 1 | -0/+108 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A repository can have multiple "reserved names" now, not just a single "short name" for the repository folder itself. Refactor to include a git_repository__reserved_names that returns all the reserved names for a repository. | |||||
| * | | | | Merge pull request #2985 from claudiuolteanu/patch-1 | Edward Thomson | 2015-03-17 | 1 | -1/+1 | |
| |\ \ \ \ | |_|/ / |/| | | | Lower case the include directive of windows header | |||||
| | * | | | Lower case the include directive of windows header | Claudiu Olteanu | 2015-03-16 | 1 | -1/+1 | |
| | | |/ | |/| | | | | Since the Linux platform has a case sensitive file system, the header name should be lower case for cross compiling purposes. (On Linux, the mingw header is called ```windows.h```). | |||||
| * | | | Merge pull request #2962 from libgit2/cmn/reflog-annotated | Edward Thomson | 2015-03-17 | 5 | -16/+66 | |
| |\ \ \ | | | | | | | | | Add annotated versions of ref-modying functions | |||||
| | * | | | Add tests for the annotated versions of ref-modifying functions | Carlos Martín Nieto | 2015-03-16 | 5 | -16/+66 | |
| | |/ / | | | | | | | | | | | | | This also brings the soft-reset tests back to life. The function name was missing an underscore, meaning they had not been running. | |||||
| * | | | Merge pull request #2982 from libgit2/cmn/stream-check-ec | Edward Thomson | 2015-03-17 | 1 | -0/+7 | |
| |\ \ \ | | | | | | | | | Don't ask for a stream's certificate unless it's encrypted | |||||
| | * | | | Add failing test for cert callback with non-ecrypted stream | Carlos Martín Nieto | 2015-03-16 | 1 | -0/+7 | |
| | |/ / | | | | | | | | | | | | | | | | When we have an HTTP stream and have set the certificatre check callback, we currently fail as we ask the unencrypted stream for its certificate. | |||||
| * | | | Merge pull request #2977 from pks-t/submodule-sync-url-fix | Edward Thomson | 2015-03-17 | 1 | -3/+3 | |
| |\ \ \ | |/ / |/| | | Fix git_submodule_sync writing URL to wrong key. | |||||
| | * | | Fix git_submodule_sync writing URL to wrong key. | Patrick Steinhardt | 2015-03-12 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently git_submodule_sync writes the submodule's URL to the key 'branch.<REMOTE_NAME>.remote' while the reference implementation of `git submodule sync` writes to 'remote.<REMOTE_NAME>.url', which is the intended behavior according to git-submodule(1). | |||||
| * | | | Put back the number of expected references to 6 from the test repo | Carlos Martín Nieto | 2015-03-13 | 1 | -3/+3 | |
| |/ / | | | | | | | | | | | | | This was but down to 5 when GitHub made a change to their server which made them stop honouring the include-tag request. This has recently been corrected, so we can bring it back up to six. | |||||
| * | | Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2 | Carlos Martín Nieto | 2015-03-11 | 1 | -0/+122 | |
| |\ \ | ||||||
| | * | | Add API to add a memory buffer to an index | Damien PROFETA | 2015-02-25 | 1 | -0/+122 | |
| | |/ | | | | | | | | | | | git_index_add_frombuffer enables now to store a memory buffer in the odb and to store an entry in the index directly if the index is attached to a repository. | |||||
| * | | Merge pull request #2970 from ethomson/inmemory_bare | Carlos Martín Nieto | 2015-03-11 | 1 | -0/+27 | |
| |\ \ | | | | | | | "In-memory" repos are bare by default | |||||
| | * | | repository_new: test its bareness | Edward Thomson | 2015-03-10 | 1 | -0/+27 | |
| | | | | ||||||
| * | | | Fixed build warning | Pierre-Olivier Latour | 2015-03-08 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | refdb: use the same id for old and new when renaming a referencecmn/rename-reflog | Carlos Martín Nieto | 2015-03-08 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we rename a reference, we want the old and new ids to be the same one (as we did not change it). The normal code path looks up the old id from the current value of the brtanch, but by the time we look it up, it does not exist anymore and thus we write a zero id. Pass the old id explicitly instead. | |||||
| * | | | Merge pull request #2961 from ethomson/filter_relative_paths | Edward Thomson | 2015-03-06 | 1 | -0/+97 | |
| |\ \ \ | | | | | | | | | Filter relative paths | |||||
| | * | | | filter::file tests: test filter_list_apply_to_file | Edward Thomson | 2015-03-06 | 1 | -0/+97 | |
| | |/ / | | | | | | | | | | | | | Test that filter_list_apply_to_file works and can accept repo-relative paths. | |||||
| * | | | branch: fix generated reflog message upon renaming | nulltoken | 2015-03-04 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | branch: fix generated reflog message upon creation | nulltoken | 2015-03-04 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #2932 from jeffhostetler/jeffhostetler/big_clone_crash | Carlos Martín Nieto | 2015-03-04 | 1 | -0/+48 | |
| |\ \ | | | | | | | Fix crash in git_clone on extremely large repos | |||||
| | * | | Fix p_ftruncate to handle big files for git_clone | Jeff Hostetler | 2015-03-03 | 1 | -0/+48 | |
| | |/ | ||||||
| * | | libgit2_shutdown: clear err message on shutdown | Edward Thomson | 2015-03-04 | 1 | -1/+0 | |
| | | | | | | | | | | | | | Clear the error message on git_libgit2_shutdown for all versions of the library (no threads and Win32 threads). Drop the giterr_clear in clar, as that shouldn't be necessary. | |||||
| * | | Merge pull request #2886 from jeffhostetler/jeffhostetler/clar_trace | Carlos Martín Nieto | 2015-03-04 | 6 | -0/+324 | |
| |\ \ | | | | | | | Set up git_trace in clar test suite. | |||||
| | * | | Converted cl_perf_timer to use git__timer internally. | Jeff Hostetler | 2015-03-03 | 2 | -76/+11 | |
| | | | | ||||||
| | * | | Added cl_perf_timer. Updated global trace to include timers. | Jeff Hostetler | 2015-03-02 | 3 | -1/+152 | |
| | | | | ||||||
| | * | | Cleanup formatting of clar trace messages. | Jeff Hostetler | 2015-03-02 | 1 | -7/+7 | |
| | | | | ||||||
| | * | | Provide mechanism to let CLAR globally setup git_trace() | Jeff Hostetler | 2015-03-02 | 4 | -0/+238 | |
| | | | | ||||||
| * | | | Merge pull request #2945 from ethomson/empty_hashsig_heap | Carlos Martín Nieto | 2015-03-04 | 1 | -0/+100 | |
| |\ \ \ | | | | | | | | | diff_tform: don't compare empty hashsig_heaps | |||||
| | * | | | diff_tform: account for whitespace options | Edward Thomson | 2015-03-04 | 1 | -6/+68 | |
| | | | | | | | | | | | | | | | | | | | | | When comparing seemingly blank files, take whitespace options into account. | |||||
| | * | | | diff_tform: don't compare empty hashsig_heaps | Edward Thomson | 2015-03-03 | 1 | -0/+38 | |
| | | | | | | | | | | | | | | | | | Don't try to compare two empty hashsig_heaps. | |||||
| * | | | | Plug a few leaks | Carlos Martín Nieto | 2015-03-04 | 3 | -0/+5 | |
| | | | | | ||||||
| * | | | | config: borrow refcounted referencescmn/config-borrow-entry | Carlos Martín Nieto | 2015-03-03 | 20 | -240/+235 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the get_entry() method to return a refcounted version of the config entry, which you have to free when you're done. This allows us to avoid freeing the memory in which the entry is stored on a refresh, which may happen at any time for a live config. For this reason, get_string() has been forbidden on live configs and a new function get_string_buf() has been added, which stores the string in a git_buf which the user then owns. The functions which parse the string value takea advantage of the borrowing to parse safely and then release the entry. | |||||
| * | | | Remove swp files | Carlos Martín Nieto | 2015-03-03 | 1 | -0/+0 | |
| | | | | ||||||
| * | | | Merge pull request #2913 from ethomson/stash_fixup | Edward Thomson | 2015-03-03 | 1 | -0/+19 | |
| |\ \ \ | | | | | | | | | stash: correctly stash wd modified/index deleted | |||||
| | * | | | stash: correctly stash wd modified/index deleted | Edward Thomson | 2015-02-18 | 1 | -0/+19 | |
| | | | | | ||||||
| * | | | | repository: remove log message override for switching the active branch | Carlos Martín Nieto | 2015-03-03 | 16 | -81/+66 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | We want to use the "checkout: moving from ..." message in order to let git know when a change of branch has happened. Make the convenience functions for this goal write this message. | |||||
| * | | | | push: remove reflog message override | Carlos Martín Nieto | 2015-03-03 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | We always use "update by push". | |||||
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |