summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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-2/+2
| | |
| * | index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-2512-59/+59
| | | | | | | | | | | | 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-242-4/+4
| |/ | | | | | | This was left over when we did the general switch.
* | refspec: move to git_buf for outputting stringsCarlos Martín Nieto2014-01-276-79/+11
| |
* | messsage: use git_buf in prettify()Carlos Martín Nieto2014-01-271-27/+3
| | | | | | | | | | 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-273-54/+9
| | | | | | | | 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-72/+26
| | | | | | | | | | 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-32/+9
| | | | | | | | | | 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-8/+26
| |
* | Add some missing const declarations.Arthur Schreiber2014-01-261-7/+7
| |
* | Merge pull request #2076 from xtao/fix-zstreamEdward Thomson2014-01-262-5/+6
|\ \ | | | | | | Fix write_object.
| * | Fix write_object.XTao2014-01-262-5/+6
| |/
* | Merge pull request #2057 from GrahamDennis/local-file-url-push-fixEdward Thomson2014-01-261-11/+37
|\ \ | |/ |/| Fix local push to file:// URL.
| * Factor out code to convert local "url" into a path.Graham Dennis2014-01-191-20/+28
| | | | | | Previously this code was shared between `local_push` and `local_connect`.
| * Fix local push to file:// URL.Graham Dennis2014-01-181-1/+19
| |
* | Merge pull request #2074 from linquize/pack-filename-sha1Vicent Marti2014-01-232-6/+0
|\ \ | | | | | | Drop parsing pack filename SHA1 part
| * | Drop parsing pack filename SHA1 part, no one cares the filenameLinquize2014-01-232-6/+0
| | |
* | | Merge pull request #2073 from ethomson/zerobytesVicent Marti2014-01-221-1/+1
|\ \ \ | | | | | | | | Sometimes a zero byte file is just a zero byte file
| * | | Sometimes a zero byte file is just a zero byte fileEdward Thomson2014-01-221-1/+1
| | | | | | | | | | | | | | | | Don't go to the ODB to resolve zero byte files in the workdir
* | | | Plug a small memory leakBen Straub2014-01-221-1/+4
| | | |
* | | | Summarize empty messagesEdward Thomson2014-01-221-1/+4
|/ / /
* | | Preserve tree filemode in index during checkoutEdward Thomson2014-01-221-2/+1
| | | | | | | | | | | | | | | | | | Don't try to determine whether the system supports file modes when putting the tree data in the index during checkout. The tree's mode is canonical and did not come from stat(2) in the first place.
* | | Drop git_patch_to_strNicolas Hake2014-01-221-18/+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-2/+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.
* | | Merge submodulesEdward Thomson2014-01-202-6/+29
| | |
* | | Support union mergesEdward Thomson2014-01-201-0/+2
| | |
* | | Remove the "merge none" flagEdward Thomson2014-01-201-11/+6
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Load merge.conflictstyle setting from configEdward Thomson2014-01-201-0/+23
| | |
* | | Introduce diff3 mode for checking out conflictsEdward Thomson2014-01-204-6/+35
| | |
* | | Don't try to merge binary filesEdward Thomson2014-01-203-2/+90
| | |
* | | merge_file should use more aggressive levelsEdward Thomson2014-01-204-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #2063 from linquize/reflog-msg-nullRussell Belfer2014-01-201-0/+2
|\ \ \ | | | | | | | | git_reflog_entry_message can be null
| * | | git_reflog_entry_message can be nullLinquize2014-01-201-0/+2
| |/ /
* | | fix corner cases and an undefined behaviorPatrick Reynolds2014-01-201-3/+6
|/ /
* | Merge pull request #2059 from linquize/git_config_get_crashEdward Thomson2014-01-181-0/+1
|\ \ | | | | | | Fix segfault when calling git_config_get_* functions when a config fails to load
| * | Fix segfault when calling git_config_get_* functions when a config fails to loadLinquize2014-01-181-0/+1
| | | | | | | | | | | | Reinitialize the result code of get_entry() to GIT_ENOTFOUND
* | | Convert gitdir paths to posix on WindowsRussell Belfer2014-01-171-1/+5
| |/ |/| | | | | | | Apparently, a .git file with "gitdir: path" link on Windows is allowed to use backslashes in the path. Who knew?
* | Merge pull request #2050 from libgit2/cmn/always-reflog-messageVicent Marti2014-01-1511-74/+68
|\ \ | | | | | | refs: remove the _with_log differentiation
| * | refs: remove the _with_log differentiationCarlos Martín Nieto2014-01-1511-74/+68
| | | | | | | | | | | | | | | | | | 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.
* | | Move libgit2 settings out of utilEdward Thomson2014-01-142-123/+134
| | |
* | | unnecessary includeEdward Thomson2014-01-141-1/+0
|/ /
* | Merge pull request #2047 from arthurschreiber/arthur/fix-dup-functionsVicent Marti2014-01-144-26/+30
|\ \ | | | | | | Align `*_dup` functions
| * | Align git_tree_entry_dup.Arthur Schreiber2014-01-141-9/+8
| | |
| * | Align git_signature_dup.Arthur Schreiber2014-01-143-17/+22
| | | | | | | | | | | | | | | | | | 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.
* | | We don't need memset here.Arthur Schreiber2014-01-141-2/+0
| | |
* | | Don't duplicate state that's only used when fetching.Arthur Schreiber2014-01-141-1/+0
|/ /
* | Add `git_remote_dup`.Arthur Schreiber2014-01-141-0/+41
| |
* | Merge pull request #2043 from arthurschreiber/arthur/fix-memory-leaksVicent Marti2014-01-145-10/+19
|\ \ | | | | | | Fix a bunch of memory leaks.
| * | Incorporate @arrbee's suggestions.Arthur Schreiber2014-01-141-14/+12
| | |
View Lorry Controller Status