proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-05 10:05:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,489 Commits 2 Branches 0 Tags 22 MiB
6d91dc5351
Commit Graph

1554 Commits

Author SHA1 Message Date
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
Edward Thomson
5ae9d296e3 git_rebase_finish: rewrite notes when finishing rebase 2014-10-26 22:59:32 -04:00
Edward Thomson
bad4937ea5 Introduce git_note_author, git_note_committer 2014-10-26 22:59:29 -04:00
Edward Thomson
517644cce4 Introduce git_rebase_finish to complete a rebase 2014-10-26 22:59:25 -04:00
Edward Thomson
93a7004cc2 git_rebase_commit: drop already-picked commits 
Already cherry-picked commits should not be re-included.  If all changes
included in a commit exist in the upstream, then we should error with
GIT_EAPPLIED.
 2014-10-26 22:59:21 -04:00
Edward Thomson
a35a9890b0 Introduce git_rebase_commit 
Commit the current patch of a rebase process.
 2014-10-26 22:59:19 -04:00
Edward Thomson
950a709159 Introduce git_rebase_next 
`git_rebase_next` will apply the next patch (or cherry-pick)
operation, leaving the results checked out in the index / working
directory so that consumers can resolve any conflicts, as appropriate.
 2014-10-26 22:59:14 -04:00
Edward Thomson
4fe84d624b Introduce git_rebase_abort 
Abort an in-progress rebase and move the working directory and
repository back to the ORIG_HEAD state.
 2014-10-26 22:59:12 -04:00
Edward Thomson
daf395b795 git_reset: const the git_signature arg 2014-10-26 22:59:10 -04:00
Edward Thomson
867a36f3a6 Introduce git_rebase to set up a rebase session 
Introduce `git_rebase` to set up a rebase session that can
then be continued.  Immediately, only merge-type rebase is
supported.
 2014-10-26 22:59:08 -04:00
Edward Thomson
d09458f3e9 Merge pull request #2638 from libgit2/cmn/config-refresh-remove 
config: remove the refresh function and backend field
 2014-10-24 16:52:39 -07:00
Edward Thomson
725cd5f29d Merge pull request #2646 from libgit2/cmn/remote-rename 
remote: accept a repo and name for renaming
 2014-10-24 16:44:07 -07:00
Carlos Martín Nieto
46c8f7f845 remote: accept a repo and name for renaming 
Remote objects are not meant to be changed from under the user. We did
this in rename, but only the name and left the refspecs, such that a
save would save the wrong refspecs (and a fetch and anything else would
use the wrong refspecs).

Instead, let's simply take a name and not change any loaded remote from
under the user.
 2014-10-24 16:25:59 +02:00
Carlos Martín Nieto
0862f617da remote: delete git_remote_supported_url() 
This function does not in fact tell us anything, as almost anything with
a colon in it is a valid rsync-style SSH path; it can not tell us that
we do not support ftp or afp or similar as those are still valid SSH
paths and we do support that.
 2014-10-24 13:40:42 +02:00
Carlos Martín Nieto
55cb499972 config: remove the refresh function and backend field 
We have been refreshing on read and write for a while now, so
git_config_refresh() is at best a no-op, and might just end up wasting
cycles.
 2014-10-23 19:05:02 +02:00
Carlos Martín Nieto
12e1803188 Update some documentation 2014-10-18 15:22:19 +02:00
Russell Belfer
babbff347c Move un-namespaced constant to internal header 
FLAG_BITS only seems to be used internally
 2014-10-10 15:17:05 -07:00
Edward Thomson
a6ed1fcbe1 Merge pull request #2593 from libgit2/cmn/remote-delete-name 
remote: accept a repository and remote name for deletion
 2014-10-10 12:21:28 -04:00
Carlos Martín Nieto
bab92a8dcf Merge pull request #2575 from cirosantilli/factor-struct-typedef 
[factor] Join typedef and struct definitions in single file.
 2014-10-10 18:06:36 +02:00
Carlos Martín Nieto
9b36537de4 Merge pull request #2588 from swansontec/ssl-cert-path2 
Add support for setting the SSL CA location
 2014-10-10 17:42:52 +02:00
Carlos Martín Nieto
0625638f06 Merge pull request #2499 from csware/hard-reset-checkout-callbacks 
Allow to propagate checkout callbacks to git HARD reset
 2014-10-10 17:40:53 +02:00
Edward Thomson
f54d8d528a Merge pull request #2574 from csware/hostname-for-certificate_check_cb 
Provide host name to certificate_check_cb
 2014-10-10 11:28:58 -04:00
Arthur Schreiber
8e398e4c84 Treat an empty list of refspecs the same as a NULL value. 2014-10-10 13:17:53 +02:00
Carlos Martín Nieto
46a2b8e855 Merge pull request #2592 from libgit2/cmn/describe 
Implement git-describe
 2014-10-09 22:24:40 +02:00
Edward Thomson
10cf4b26a0 Merge pull request #2448 from libgit2/cmn/reference-transaction 
Introduce reference transactions
 2014-10-09 10:49:37 -04:00