proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 19:37:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,280 Commits 2 Branches 0 Tags 22 MiB
a6ed1fcbe1
Commit Graph

7280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
942a7b39ed Fix test build 
Some PRs have fallen out of sync with the changes in signatures, so we
need to take a few extra parameters into account.
 2014-10-10 18:03:09 +02:00
Carlos Martín Nieto
4c0c001529 Merge pull request #2498 from linquize/read-large-file 
Can read large file larger than 2GB on Win64
 2014-10-10 17:58:35 +02:00
Carlos Martín Nieto
33ca356598 Merge pull request #2556 from sbc100/fix_warnings 
Fix warnings in thread-utils.h when building without -DTHREADSAFE=ON
 2014-10-10 17:52:31 +02:00
Carlos Martín Nieto
2139c9b76c Merge pull request #2542 from linquize/fetch-head 
Do not error out when fetching from second remote
 2014-10-10 17:50:28 +02:00
Carlos Martín Nieto
a60d0f11f4 Merge pull request #2600 from libgit2/cmn/embed-ssh 
Provide option to embed libssh2
 2014-10-10 17:46:53 +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
Edward Thomson
533da4ea00 Merge pull request #2473 from arthurschreiber/arthur/new-javascript-test-files 
New test files for the javascript diff driver.
 2014-10-10 10:03:06 -04:00
Edward Thomson
f339f441f9 Merge pull request #2603 from libgit2/cmn/revwalk-merge-base 
Walk only as far as the common ancestors of uninteresting commits
 2014-10-10 09:59:26 -04:00
Carlos Martín Nieto
bd62dc6fdd Merge pull request #2606 from arthurschreiber/arthur/align-git-remote-fetch 
Treat an empty list of refspecs the same as a NULL value.
 2014-10-10 13:57:36 +02: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
Arthur Schreiber
994a3006b6 Update the javascript diff driver's function pattern. 2014-10-09 22:21:34 +02:00
Arthur Schreiber
19fa9c0ca0 New test files for the javascript diff driver. 2014-10-09 22:14:55 +02:00
Edward Thomson
324154a453 Merge branch 'anuraggup/git_filter' 2014-10-09 14:57:19 -04:00
Anurag Gupta (OSG)
5623e627d4 git_filter: dup the filter name 2014-10-09 14:54:48 -04:00
Edward Thomson
dfff1b5bcb Merge pull request #2599 from linquize/config-trailing-spaces 
config: Handle multiple spaces that follow a configuration value and precede a comment char
 2014-10-09 12:16:17 -04:00
Edward Thomson
919e701605 Merge pull request #2601 from SeijiIto/master 
Fix README.md
 2014-10-09 11:38:31 -04:00
Sven Strickroth
db3d169c33 Add tests for host names 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2014-10-09 17:32:38 +02:00
Edward Thomson
8371457ce2 Merge pull request #2597 from ethomson/fixup 
Trivial fixups
 2014-10-09 11:32:26 -04:00
Carlos Martín Nieto
eecc177272 Fix an uninitialized variable 2014-10-09 17:02:11 +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
Edward Thomson
8be28acfcd Merge pull request #2462 from libgit2/cmn/remote-fetch-refs 
Implement opportunistic ref updates
 2014-10-09 10:41:38 -04:00
Carlos Martín Nieto
c327d5db8b transaction: rename lock() to lock_ref() 
This leaves space for future expansion to locking other resources
without having to change the API for references.
 2014-10-09 16:29:30 +02:00
Carlos Martín Nieto
8bd747cfb4 Merge pull request #2604 from arthurschreiber/arthur/add-merge-bases-many 
Add `git_merge_bases_many`
 2014-10-09 16:00:28 +02:00
Arthur Schreiber
917f85a1a4 Extract shared functionality. 2014-10-09 14:19:00 +02:00
Arthur Schreiber
eca07bcd83 Add git_merge_bases_many. 2014-10-09 14:19:00 +02:00
Carlos Martín Nieto
d6afda62d9 revwalk: clear first-parent flag on reset 
This should have been included when implementing the feature but was
missed.
 2014-10-08 17:17:31 +02:00
Carlos Martín Nieto
9b5d6cea4a revwalk: catch no-push and no-hide cases 
If there have been no pushes, we can immediately return ITEROVER. If
there have been no hides, we must not run the uninteresting pre-mark
phase, as we do not want to hide anything and this would simply cause us
to spend time loading objects.
 2014-10-08 17:14:48 +02:00
Carlos Martín Nieto
e7970576f1 revwalk: mark uninteresting only up to the common ancestors 
This introduces a phase at the start of preparing a walk which pre-marks
uninteresting commits, but only up to the common ancestors.

We do this in a similar way to git, by walking down the history and
marking (which is what we used to do), but we keep a time-sorted
priority queue of commits and stop marking as soon as there are only
uninteresting commits in this queue.

This is a similar rule to the one used to find the merge-base. As we
keep inserting commits regardless of the uninteresting bit, if there are
only uninteresting commits in the queue, it means we've run out of
interesting commits in our walk, so we can stop.

The old mark_unintesting() logic is still in place, but that stops
walking if it finds an already-uninteresting commit, so it will stop on
the ones we've pre-marked; but keeping it allows us to also hide those
that are hidden via the callback.
 2014-10-08 15:52:11 +02:00
Carlos Martín Nieto
ad66bf88df revwalk: keep a single list of user inputs 
The old separation was due to the old merge-base finding, so it's no
longer necessary.
 2014-10-08 10:45:47 +02:00
Carlos Martín Nieto
42835aa6b8 revwalk: clear the flags on reset 
These store merge-base information which is only valid for a single run.
 2014-10-08 10:24:06 +02:00
SeijiIto
18925129b2 Fix README.md 2014-10-06 16:17:01 +09:00
Carlos Martín Nieto
3753110aed Provide option to embed libssh2 2014-10-05 12:13:40 +02:00
Linquize
a447a7e40b config: Add test cases that have trailing spaces before comment chars 2014-10-04 23:28:40 +08:00
Linquize
0a64164700 config: Fix multiple trailing spaces before comments not completely trimmed 2014-10-04 23:27:06 +08:00
Edward Thomson
7c9bf891d5 repository_head_unborn: clear error when HEAD is unborn 2014-10-03 19:34:37 -04:00
Edward Thomson
ca7cd1734d p_mkdir != mkdir on win32 2014-10-03 19:30:48 -04:00
Vicent Marti
9f57fd6443 Merge pull request #2594 from libgit2/vmg/hashsig 
hashsig: Export as a `sys` header
 2014-10-01 12:25:11 +02:00
Vicent Marti
737b505116 hashsig: Export as a sys header 2014-10-01 12:03:24 +02:00
William Swanson
737b445a18 Add support for setting the SSL CA location 
This allows users to specify self-signed certificates, or to provide their
own certificate stores on limited platforms such as mobile phones.
 2014-09-30 17:26:39 -07:00
Carlos Martín Nieto
5451754d46 Include git2/odb_backend.h in git2.h 
Since this isn't under sys/ we need to have it included in the main
git2.h file.

This fixes #2551.
 2014-09-30 16:27:53 +02:00
Erdur
44802c551e path: fix invalid access 2014-09-30 16:19:24 +02:00
Carlos Martín Nieto
262eec23fe remote: accept a repository and remote name for deletion 
We don't need the remote loaded, and the function extracted both of
these from the git_remote in order to do its work, so let's remote a
step and not ask for the loaded remote at all.

This fixes #2390.
 2014-09-30 16:09:55 +02:00
Carlos Martín Nieto
274c3fa62e Add changelog for transactions 2014-09-30 15:52:14 +02:00
Carlos Martín Nieto
db2f82630c transaction: add documentation 2014-09-30 15:52:13 +02:00
Carlos Martín Nieto
f99ca52378 stash: use a transaction to modify the reflog 
The stash is implemented as the refs/stash reference and its reflog. In
order to modify the reflog, we need avoid races by making sure we're the
only ones allowed to modify the reflog.

We achieve this via the transactions API. Locking the reference gives us
exclusive write access, letting us modify and write it without races.
 2014-09-30 15:52:13 +02:00