David Calavera
d76e9df9a2
Include git2/common.h in sys/openssl.h.
2015-01-02 15:56:03 -08:00
Pierre-Olivier Latour
f8263472d1
Fixed git_revert() documentation
2014-12-30 15:54:30 -08:00
Edward Thomson
a3ef70bb40
Merge pull request #2761 from libgit2/cmn/fetch-prune
...
Remote-tracking branch prunning
2014-12-30 11:53:55 -06:00
Edward Thomson
c4c47fc286
Merge pull request #2762 from libgit2/cmn/hide-push
...
remote: remove git_push from the public API
2014-12-30 11:53:45 -06:00
Carlos Martín Nieto
fe794b2ea7
remote: remove git_push from the public API
...
Instead we provide git_remote_upload() and git_remote_update_tips() in
order to have a parallel API for fetching and pushing.
2014-12-30 17:02:50 +00:00
Carlos Martín Nieto
208a2c8aef
treebuilder: rename _create() to _new()
...
This function is a constructor, so let's name it like one and leave
_create() for the reference functions, which do create/write the
reference.
2014-12-27 12:09:11 +00:00
Edward Thomson
2fe8157e1b
index: reuc and name entrycounts should be size_t
...
For the REUC and NAME entries, we use size_t internally, and we take
size_t for the get_byindex() functions, but the entrycount() functions
strangely cast to an unsigned int instead.
2014-12-22 18:42:03 -06:00
Edward Thomson
d147900ea4
Merge pull request #2759 from libgit2/cmn/openssl-sys
...
Make OpenSSL locking warnings more severe
2014-12-20 21:24:45 -06:00
Damien PROFETA
ceb651c9b0
Fix public header on sys/refs.h
...
GIT_BEGIN/END_DECL were missing from sys/refs.h and preventing
compilation with g++ as the symbol were mangled.
2014-12-19 15:31:49 +01:00
Edward Thomson
dce7b1a4e7
treebuilder: take a repository for path validation
...
Path validation may be influenced by `core.protectHFS` and
`core.protectNTFS` configuration settings, thus treebuilders
can take a repository to influence their configuration.
2014-12-17 13:05:27 -05:00
Carlos Martín Nieto
26186b155b
fetch: remove the prune setter
...
This option does not get persisted to disk, which makes it different
from the rest of the setters. Remove it until we go all the way.
We still respect the configuration option, and it's still possible to
perform a one-time prune by calling the function.
2014-12-14 21:52:27 +01:00
Linquize
5f47394753
remote: prune refs when fetching
2014-12-14 17:04:01 +01:00
Carlos Martín Nieto
263b1d6ed9
Make the OpenSSL locking function warnings more severe
...
Our git_openssl_set_locking() would ideally not exist. Make it clearer
that we provide it as a last resort and you should prefer anything else.
2014-12-12 15:46:57 +01:00
Carlos Martín Nieto
85a6d5f49c
push: reword comment on finish()
...
This should make it clearer what the return value implies.
2014-12-10 18:55:54 +01:00
Carlos Martín Nieto
d524b2d3d1
push: fold unpack_ok() into finish()
...
The push cannot be successful if we sent a bad packfile. We should
return an error in that case instead of storing it elsewhere.
2014-12-10 18:55:54 +01:00
Edward Thomson
cd305c2f56
Merge pull request #2678 from libgit2/cmn/io-stream
...
Introduce stackable IO streams
2014-12-10 11:30:28 -05:00
Carlos Martín Nieto
49ae22baac
stream: constify the write buffer
2014-12-10 16:20:52 +01:00
Carlos Martín Nieto
dd4ff2c9b5
Introduce stackable IO streams
...
We currently have gitno for talking over TCP, but this needs to know
about both plaintext and OpenSSL connections and the code has gotten
somewhat messy with ifdefs determining which version of the function
should be called.
In order to clean this up and abstract away the details of sending over
the different types of streams, we can instead use an interface and
stack stream implementations.
We may not be able to use the stackability with all streams, but we
are definitely be able to use the abstraction which is currently spread
between different bits of gitno.
2014-12-10 01:17:40 +01:00
Edward Thomson
f2e09b8aac
Merge pull request #2748 from libgit2/cmn/doc-all
...
doc: add documentation to all the public structs and enums
2014-12-06 12:26:04 -05:00
Carlos Martín Nieto
bfa6cdbf13
notes: fix comments for git_note_next()
...
The iterator is the last argument. There is also no returned notes, just
ids, so the comment about freeing is out of place.
2014-12-06 04:20:10 +01:00
Carlos Martín Nieto
21083a7129
notes: move the notes name argument
...
Make it consistent between git_note_create() and git_note_remote() by
putting it after the repository.
2014-12-06 04:20:09 +01:00
Carlos Martín Nieto
a295bd2dc4
doc: add documentation to all the public structs and enums
...
This makes them show up in the reference, even if the text itself isn't
the most descriptive.
These have been found with
grep -Przon '\n\ntypedef struct.*?\{' -- include
grep -Przon '\n\ntypedef enum.*?\{' -- include
2014-12-06 03:44:40 +01:00
nulltoken
30ec05260d
Merge pull request #2744 from epmatsw/spelling
...
Spelling fixes
2014-12-05 07:44:09 +01:00
Will Stamper
b874629b2d
Spelling fixes
2014-12-04 21:06:59 -06:00
Edward Thomson
6d91dc5351
init: return the number of initializations
2014-12-04 20:42:27 -05:00
Edward Thomson
e952bc5a57
Merge pull request #2718 from libgit2/cmn/peeling-errors
...
peel: reject bad queries with EPEEL
2014-11-23 17:15:18 -05:00
Carlos Martín Nieto
753e17b0f5
peel: reject bad queries with EINVALIDSPEC
...
There are some combination of objects and target types which we know
cannot be fulfilled. Return EINVALIDSPEC for those to signify that there
is a mismatch in the user-provided data and what the object model is
capable of satisfying.
If we start at a tag and in the course of peeling find out that we
cannot reach a particular type, we return EPEEL.
2014-11-22 18:55:22 +01:00
Carlos Martín Nieto
8fd7dd778d
remote: don't say we free the remote on disconnect
...
On disconnect we simply ask the transport to close the connection, we do
not free it.
2014-11-19 15:49:47 +01:00
Carlos Martín Nieto
699dfcc3bc
remote: clarify which list of references _ls() returns
...
Make it clear that this is not the ls-remote command but a way to access
the data we have and how long it's kept around.
2014-11-19 15:49:02 +01:00
Edward Thomson
45301cca30
Merge pull request #2608 from libgit2/cmn/remote-push
...
Provide a convenience function `git_remote_push()`
2014-11-18 11:44:59 -05:00
Carlos Martín Nieto
64e3e6d43a
remote: use configured push refspecs if none are given
...
If the user does not pass any refspecs to push, try to use those
configured via the configuration or via add_push().
2014-11-09 00:01:58 +01:00
Carlos Martín Nieto
3149547b5a
remote: introduce git_remote_push()
...
This function, similar in style to git_remote_fetch(), performs all the
steps required for a push, with a similar interface.
The remote callbacks struct has learnt about the push callbacks, letting
us set the callbacks a single time instead of setting some in the remote
and some in the push operation.
2014-11-09 00:01:58 +01:00
Carlos Martín Nieto
799e22ea0c
Rename git_threads_ to git_libgit2_
...
This describes their purpose better, as we now initialize ssl and some
other global stuff in there. Calling the init function is not something
which has been optional for a while now.
2014-11-08 23:46:39 +01:00
Edward Thomson
02bc523304
Merge pull request #2698 from libgit2/cmn/fetchhead-refactor
...
Refactor fetchhead
2014-11-08 17:05:13 -05:00
Edward Thomson
bc8c4a8aeb
Merge pull request #2695 from libgit2/cmn/remote-lookup
...
remote: rename _load() to _lookup()
2014-11-08 16:55:23 -05:00
Carlos Martín Nieto
82374d9825
branch: add getter for the upstream remote name
...
This gets the value from branch.<foo>.remote.
2014-11-08 20:00:17 +01:00
Carlos Martín Nieto
209425ce26
remote: rename _load() to _lookup()
...
This brings it in line with the rest of the lookup functions.
2014-11-08 13:28:27 +01:00
Ungureanu Marius
6818208569
git_status_file now takes an exact path
...
This function has one output but can match multiple files, which can be
unexpected for the user, which would usually path the exact path of the
file he wants the status of.
2014-11-07 21:34:54 +02:00
Edward Thomson
7bb639911b
Merge pull request #2676 from libgit2/cmn/threading
...
Threading and crypto libraries
2014-11-06 10:25:23 -05:00
Edward Thomson
0a62918188
Merge pull request #2661 from swisspol/2656
...
Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
2014-11-03 15:10:14 +01:00
Carlos Martín Nieto
521c0cab7a
merge: talk about the merging state after git_merge()
...
Since it's not necessarily obvious, mention the merging state and how to
clear it.
2014-11-02 17:18:19 +01:00
Carlos Martín Nieto
fe6b51ae40
ssl: separate locking init from general init
...
Extract the lock-setting functions into their own, as we cannot assume
that it's ok for us to set this unconditionally.
2014-11-01 10:58:55 +01:00
Pierre-Olivier Latour
d88766c4e1
Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
2014-10-27 09:17:01 -07:00
Edward Thomson
979645a719
rebase: updates based on PR comments
2014-10-26 22:59:50 -04:00
Edward Thomson
18b00406c6
s/git_merge_head/git_annotated_commit
...
Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.
2014-10-26 22:59:48 -04:00
Edward Thomson
e69737d760
rebase: oid member of operation should be const
2014-10-26 22:59:43 -04:00
Edward Thomson
ed2c06a6a1
git_rebase: iterators for operations
2014-10-26 22:59:41 -04:00
Edward Thomson
f152f8ac0c
rebase: preload all operations
2014-10-26 22:59:38 -04:00
Edward Thomson
b6b636a7fa
rebase: init/open a git_rebase object
2014-10-26 22:59:36 -04:00
Edward Thomson
18b439b9be
git_rebase_next: provide info about the operation
2014-10-26 22:59:34 -04:00