Russell Belfer
22df47cbc5
Fix segfault if gitmodules is invalid
...
The reload_all call could end up dereferencing a NULL pointer if
there was an error while attempting to load the submodules config
data (i.e. invalid content in the gitmodules file). This fixes it.
2014-03-26 14:38:26 -07:00
Vicent Marti
dc7efa1aef
Merge pull request #2204 from libgit2/rb/submodule-reference-counting
...
Make submodules externally refcounted
2014-03-26 18:29:34 +01:00
Edward Thomson
451aaf866a
Merge pull request #2181 from anuraggup/hide_cb
...
Callback function to hide commit and its parents in revision walker
2014-03-25 10:33:18 -07:00
Russell Belfer
a15c7802c8
Make submodules externally refcounted
...
`git_submodule` objects were already refcounted internally in case
the submodule name was different from the path at which it was
stored. This makes that refcounting externally used as well, so
`git_submodule_lookup` and `git_submodule_add_setup` return an
object that requires a `git_submodule_free` when done.
2014-03-25 09:14:48 -07:00
Anurag Gupta
892b7c9fef
Correcting format of comments in header file
2014-03-24 11:20:51 -07:00
Anurag Gupta
3a666071d9
Unit Tests for hide_cb in revwalk
2014-03-24 11:20:13 -07:00
Anurag Gupta
892aa808e2
Callback to hide commits in revision walker.
2014-03-24 11:20:03 -07:00
Vicent Marti
85a41fc4bf
Merge pull request #2183 from ethomson/merge_refactor
...
Refactor the `git_merge` API
2014-03-24 18:09:13 +01:00
Carlos Martín Nieto
6057c4a038
opts: bits are not bytes
...
The default cache size is 256 megabytes, not megabits as claimed in the
docs.
2014-03-24 13:21:51 +01:00
Carlos Martín Nieto
42dee8ecd7
settings: use git_buf for returning strings
...
This survived the last round of culling, as the signature is only in the
comments.
2014-03-24 13:21:51 +01:00
Edward Thomson
58c2b1c421
UNBORN implies FAST_FORWARD
2014-03-20 09:35:22 -07:00
Edward Thomson
ac584fcfd3
Introduce GIT_MERGE_ANALYSIS_UNBORN
2014-03-20 09:25:11 -07:00
Edward Thomson
97f3462ae6
git_merge_status -> git_merge_analysis
2014-03-20 09:25:10 -07:00
Edward Thomson
d9fdee6e4c
Remove git_merge_result as it's now unnecessary
2014-03-20 09:25:09 -07:00
Edward Thomson
5aa2ac6de1
Update git_merge_tree_opts to git_merge_options
2014-03-20 09:25:08 -07:00
Edward Thomson
02105a27f0
Change signature of git_merge to take merge and checkout opts
2014-03-20 09:25:07 -07:00
Edward Thomson
1c0b6a38ba
Remove fastforward / uptodate from git_merge
2014-03-20 09:25:06 -07:00
Edward Thomson
ccb308273a
Add git_merge_status to provide info about an upcoming merge
2014-03-20 09:25:06 -07:00
Edward Thomson
05d47768ca
Introduce git_merge_file for consumers
2014-03-20 09:25:05 -07:00
Vicent Marti
5dd7d2432e
Merge pull request #2189 from Aimeast/octopus
...
Implement git_merge_base_octopus
2014-03-18 16:23:51 +01:00
Aimeast
0aee025bef
Implement git_merge_base_octopus
2014-03-18 22:31:14 +08:00
Vicent Marti
dd4c6962d7
Merge pull request #2192 from phkelley/development
...
Seamless support for NTLM/Kerberos auth on Windows
2014-03-18 15:25:43 +01:00
Philip Kelley
1392418ea8
Seamless support for NTLM/Kerberos auth on Windows
2014-03-18 10:24:23 -04:00
Carlos Martín Nieto
853b1407c0
branch: constness fixes
2014-03-17 17:47:46 +01:00
Carlos Martín Nieto
2b40390f22
refs: fix copy-paste doc error
2014-03-13 15:54:53 +01:00
Jan Melcher
52fba18f4e
Add git_submodule_resolve_url()
2014-03-10 18:16:10 +01:00
Vicent Marti
041cd4a23f
Merge pull request #2028 from libgit2/options-names
...
Rename options structures
2014-03-07 19:02:58 +01:00
Russell Belfer
5a6de908f6
Merge pull request #2153 from mekishizufu/tag_example
...
Add a tag example
2014-03-07 09:13:43 -08:00
Ben Straub
aa17c3c63c
git_revert_opts -> git_revert_options
2014-03-06 09:44:52 -08:00
Ben Straub
6affd71f33
git_checkout_opts -> git_checkout_options
2014-03-06 09:44:51 -08:00
Vicent Marti
2ab6d2cd47
Revert pull request #1997
2014-03-06 16:08:17 +01:00
Vicent Marti
4d116c3413
Merge pull request #1997 from mgbowen/merge-options-init-fix
...
Fix GIT_MERGE_OPTS_INIT on MSVC.
2014-03-06 16:08:12 +01:00
Matthew Bowen
b9f819978c
Added function-based initializers for every options struct.
...
The basic structure of each function is courtesy of arrbee.
2014-03-05 21:49:23 -05:00
Jiri Pospisil
4ae4a9bbd1
Fix typo
2014-03-05 20:31:15 +01:00
Russell Belfer
13f7ecd7b9
Add git_object_short_id API to get short id string
...
This finds a short id string that will unambiguously select the
given object, starting with the core.abbrev length (usually 7)
and growing until it is no longer ambiguous.
2014-03-04 16:23:28 -08:00
Russell Belfer
f5753999e4
Add exists_prefix to ODB backend and ODB API
2014-03-04 15:34:23 -08:00
Arthur Schreiber
96484ecd9e
Fix the description for GIT_FEATURE_SSH.
2014-03-03 12:59:35 +01:00
Vicent Marti
ebb3c506fd
features: Rename _HAS_ to _FEATURE_
2014-03-03 12:40:25 +01:00
Vicent Marti
2491c416ed
caps: Rename the enum name too!
2014-03-03 12:13:17 +01:00
Vicent Marti
c9f5298b0e
caps: Rename to features to avoid confusion
2014-03-03 12:10:36 +01:00
Russell Belfer
6789b7a75d
Add buffer to buffer diff and patch APIs
...
This adds `git_diff_buffers` and `git_patch_from_buffers`. This
also includes a bunch of internal refactoring to increase the
shared code between these functions and the blob-to-blob and
blob-to-buffer APIs, as well as some higher level assert helpers
in the tests to also remove redundancy.
2014-02-27 14:13:22 -08:00
Ben Straub
1574d3884f
Merge pull request #2137 from jru/blame-first-parent
...
Blame first-parent history
2014-02-26 16:58:20 -05:00
Juan Rubén
899bd19a62
Document enumerator and rewording
2014-02-24 21:20:57 +01:00
Juan Rubén
c7c833947e
Add option to limit blame to first parent
2014-02-23 23:26:12 +01:00
Edward Thomson
c254e2b641
Improve documentation for merging
2014-02-21 09:28:15 -08:00
Russell Belfer
72556cc63b
Address PR comments
...
* Make GIT_INLINE an internal definition so it cannot be used in
public headers
* Fix language in CONTRIBUTING
* Make index caps API use signed instead of unsigned values
2014-02-20 14:27:10 -08:00
Russell Belfer
978a4ed5eb
Make git_oid_equal a non-inline API
2014-02-20 11:00:31 -08:00
Carlos Martín Nieto
15284a2c5a
refs: move current_id before the reflog parameters
...
Keep the reflog parameters as the last two, as they're the optional
parameters.
2014-02-10 14:52:28 +01:00
Carlos Martín Nieto
77ad675464
refs: conditional wording fixups
...
This addresses arrbee's concerns about wording in the conditional
reference udpate functions.
2014-02-10 14:38:01 +01:00
Russell Belfer
80c29fe93e
Add git_commit_amend API
...
This adds an API to amend an existing commit, basically a shorthand
for creating a new commit filling in missing parameters from the
values of an existing commit. As part of this, I also added a new
"sys" API to create a commit using a callback to get the parents.
This allowed me to rewrite all the other commit creation APIs so
that temporary allocations are no longer needed.
2014-02-07 16:17:59 -08:00
