summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | Some fixes for Windows x64 warningsRussell Belfer2014-01-301-1/+1
| |
* | Make submodule fetchRecurse match other optionsRussell Belfer2014-01-302-13/+19
| | | | | | | | | | | | This removes the fetchRecurse compiler warnings and makes the behavior match the other submodule options (i.e. the in-memory setting can be reset to the on-disk value).
* | Some missing oid to id renamesRussell Belfer2014-01-301-2/+3
| |
* | Add `git_graph_descendant_of`.Arthur Schreiber2014-01-281-0/+14
| |
* | Merge pull request #2075 from libgit2/cmn/leftover-oidVicent Marti2014-01-276-15/+15
|\ \ | | | | | | Leftover OID -> ID changes
| * | merge: rename _oid() -> id()Carlos Martín Nieto2014-01-251-4/+4
| | | | | | | | | | | | Following the rest of the series, use 'id' when refering to the value.
| * | diff: change id abbrev option's name to id_abbrevCarlos Martín Nieto2014-01-251-1/+1
| | | | | | | | | | | | | | | Same as the other commits in the series, we use 'id' when talking about thing rather than the datatype.
| * | diff: rename the file's 'oid' to 'id'Carlos Martín Nieto2014-01-251-2/+2
| | | | | | | | | | | | In the same vein as the previous commits in this series.
| * | tree: remove legacy 'oid' namingCarlos Martín Nieto2014-01-251-3/+3
| | | | | | | | | | | | Rename git_tree_entry_byoid() to _byid() as per the convention.
| * | commit: remvoe legacy 'oid' namingCarlos Martín Nieto2014-01-251-1/+1
| | |
| * | index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-1/+1
| | | | | | | | | | | | This was not converted when we converted the rest, so do it now.
| * | note: rename the id getter to git_note_id()Carlos Martín Nieto2014-01-241-3/+3
| | | | | | | | | | | | This was left over when we did the general switch.
* | | refspec: move to git_buf for outputting stringsCarlos Martín Nieto2014-01-271-4/+3
| | |
* | | messsage: use git_buf in prettify()Carlos Martín Nieto2014-01-271-12/+5
| | | | | | | | | | | | | | | A lot of the tests were checking for overflow, which we don't have anymore, so we can remove them.
* | | config: use git_buf for returning pathsCarlos Martín Nieto2014-01-271-13/+11
| | | | | | | | | | | | Again, we already did this internally, so simply remove the conversions.
* | | branch: move to git_buf when outputting newly-allocated stringsCarlos Martín Nieto2014-01-271-21/+10
| | | | | | | | | | | | | | | Internally we already did everything with git_bufs, so this is just exposing those functions with public names.
* | | repository: move to use a git_buf for outputting stringsCarlos Martín Nieto2014-01-271-19/+7
| | | | | | | | | | | | | | | Since we now export that type, we can avoid making the user guess a size.
* | | Make sure git_remote_dup copies a remote's refspecs correctly.Arthur Schreiber2014-01-261-1/+1
| | |
* | | Add some missing const declarations.Arthur Schreiber2014-01-261-6/+6
|/ /
* | Drop git_patch_to_strNicolas Hake2014-01-221-11/+0
| | | | | | | | | | | | | | It's hard or even impossible to correctly free the string buffer allocated by git_patch_to_str in some circumstances. Drop the function so people have to use git_patch_to_buf instead - git_buf has a dedicated destructor.
* | Expose patch serialization to git_bufNicolas Hake2014-01-221-0/+10
| | | | | | | | | | | | | | | | | | | | | | Returning library-allocated strings from libgit2 works fine on Linux, but may cause problems on Windows because there is no one C Runtime that everything links against. With libgit2 not exposing its own allocator, freeing the string is a gamble. git_patch_to_str already serializes to a buffer, then returns the underlying memory. Expose the functionality directly, so callers can use the git_buf_free function to free the memory later.
* | Support union mergesEdward Thomson2014-01-201-0/+3
| |
* | Remove the "merge none" flagEdward Thomson2014-01-201-5/+2
| | | | | | | | | | | | | | The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
* | Introduce diff3 mode for checking out conflictsEdward Thomson2014-01-201-0/+7
| |
* | merge_file should use more aggressive levelsEdward Thomson2014-01-201-7/+14
| | | | | | | | | | | | | | | | | | | | | | The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.
* | "Uninitialized" submodules are "unmodified"Edward Thomson2014-01-201-1/+2
| | | | | | | | | | | | Extend the "unmodified" submodule workdir test to include uninitialized submodules, to prevent reporting submodules as modified when they're not in the workdir at all.
* | Revert a wrong doc change.Arthur Schreiber2014-01-161-1/+1
| |
* | Fix some documentation issues.Arthur Schreiber2014-01-161-6/+6
| |
* | refs: remove the _with_log differentiationCarlos Martín Nieto2014-01-151-128/+24
| | | | | | | | | | | | Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters.
* | Align git_tree_entry_dup.Arthur Schreiber2014-01-141-3/+4
| |
* | Align git_signature_dup.Arthur Schreiber2014-01-141-3/+4
| | | | | | | | | | | | This changes git_signature_dup to actually honor oom conditions raised by the call to git__strdup. It also aligns it with the error code return pattern used everywhere else.
* | Add `git_remote_dup`.Arthur Schreiber2014-01-141-0/+12
| |
* | Handle git_buf's from users more liberallyEdward Thomson2014-01-081-1/+1
| |
* | Fix spelling mistakeJohn Crepezzi2014-01-041-1/+1
| | | | | | Closes #2029
* | Merge pull request #2022 from KTXSoftware/developmentRussell Belfer2014-01-031-0/+8
|\ \ | | | | | | submodule branch option + little VS2013 fix
| * | Read the submodule branch option from Git 1.8.2.Robert Konrad2014-01-021-0/+8
| | |
* | | Fix warnings with submodule changesRussell Belfer2014-01-021-1/+1
|/ /
* | Accept 'submodule.*.fetchRecurseSubmodules' config 'on-demand' valueLinquize2013-12-311-2/+15
| |
* | Merge pull request #1920 from libgit2/cmn/ref-with-logVicent Marti2013-12-183-23/+164
|\ \ | | | | | | Reference operations with log
| * | refs: expose has_log() on the backendCarlos Martín Nieto2013-12-092-3/+8
| | | | | | | | | | | | | | | | | | The frontend used to look at the file directly, but that's obviously not the right thing to do. Expose it on the backend and use that function instead.
| * | refs: expose a way to ensure a ref has a logCarlos Martín Nieto2013-12-092-0/+18
| | | | | | | | | | | | | | | | | | Sometimes (e.g. stash) we want to make sure that a log will be written, even if it's not in one of the standard locations. Let's make that easier.
| * | reflog: remove git_reflog_append_to()Carlos Martín Nieto2013-11-231-18/+1
| | | | | | | | | | | | | | | | | | This was a convenience method for the refs front-end to do the reflog writing. This is now done in the backend and it has no more reason for being.
| * | reflog: integrate into the ref writingCarlos Martín Nieto2013-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a reference is created or updated, we need to write to the reflog regardless of whether the user gave us a message, so we shouldn't leave that to the ref frontend, but integrate it into the backend. This also eliminates the race between ref update and writing to the reflog, as we protect the reflog with the ref lock. As an additional benefit, this reflog append on the backend happens by appending to the file instead of parsing and rewriting it.
| * | refdb: add a `message` parameter for appending to the logCarlos Martín Nieto2013-11-231-2/+4
| | | | | | | | | | | | This is as yet unused.
| * | refs: Introduce git_reference_symbolic_set_target_with_log()nulltoken2013-11-231-0/+25
| | |
| * | refs: Introduce git_reference_set_target_with_log()nulltoken2013-11-231-0/+23
| | |
| * | refs: Introduce git_reference_symbolic_create_with_log()nulltoken2013-11-231-0/+42
| | |
| * | refs: Introduce git_reference_create_with_log()nulltoken2013-11-231-0/+43
| | |
* | | Overwrite ignored files on checkoutEdward Thomson2013-12-131-0/+8
| | |
* | | Add git_treebuilder_insert test and clarify docRussell Belfer2013-12-121-2/+9
| | | | | | | | | | | | | | | | | | This wasn't being tested and since it has a callback, I fixed it even though the return value of this callback is not treated like any of the other callbacks in the API.
View Lorry Controller Status