summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | refs: conditional ref updatesCarlos Martín Nieto2014-02-052-6/+46
| |/ / | | | | | | | | | Allow updating references if the old value matches the given one.
* | | Merge pull request #2094 from libgit2/cmn/push-non-commitRussell Belfer2014-02-051-4/+10
|\ \ \ | | | | | | | | Add flexibility to the revwalk API
| * | | revwalk: ignore wrong object type in glob pushesCarlos Martín Nieto2014-02-051-0/+6
| | | | | | | | | | | | | | | | | | | | Pushing a whole namespace can cause us to attempt to push non-committish objects. Catch this situation and special-case it for ignoring this.
| * | | revwalk: accept committish objectsCarlos Martín Nieto2014-02-051-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the user push committish objects and peel them to figure out which commit to push to our queue. This is for convenience and for allowing uses of git_revwalk_push_glob(w, "tags") with annotated tags.
* | | docs: produce literal asterisksCarlos Martín Nieto2014-02-051-2/+2
|/ /
* | Add `git_reference_is_note`.Arthur Schreiber2014-02-021-0/+10
| |
* | Document branch-creation reflog betterBen Straub2014-01-301-1/+3
| |
* | Ensure renaming a reference updates the reflogBen Straub2014-01-301-1/+5
| |
* | Add reflog parameters to git_branch_moveBen Straub2014-01-301-1/+7
| |
* | Augment clone API with reflog parametersBen Straub2014-01-301-1/+6
| |
* | Add reflog params to git_branch_createBen Straub2014-01-301-1/+7
| |
* | Add reflog params to set-head callsBen Straub2014-01-301-2/+10
| |
* | 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
| |
View Lorry Controller Status