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
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
SeijiIto
18925129b2
Fix README.md
2014-10-06 16:17:01 +09: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
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
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
Carlos Martín Nieto
ab8d9242f5
Introduce reference transactions
...
A transaction allows you to lock multiple references and set up changes
for them before applying the changes all at once (or as close as the
backend supports).
This can be used for replication purposes, or for making sure some
operations run when the reference is locked and thus cannot be changed.
2014-09-30 15:44:32 +02:00
Carlos Martín Nieto
bdeb8772fe
signature: add a dup function which takes a pool
...
This will be used by the transaction code.
2014-09-30 15:44:32 +02:00
Carlos Martín Nieto
20363d583c
reflog: constify byindex
2014-09-30 15:44:32 +02:00
Carlos Martín Nieto
c5837cad85
remote: implement opportunistic remote-tracking branch updates
...
When a list of refspecs is passed to fetch (what git would consider
refspec passed on the command-line), we not only need to perform the
updates described in that refspec, but also update the remote-tracking
branch of the fetched remote heads according to the remote's configured
refspecs.
These "fetches" are not however to be written to FETCH_HEAD as they
would be duplicate data, and it's not what the user asked for.
2014-09-30 15:43:24 +02:00
Carlos Martín Nieto
2cdd5c5752
remote: store passive refspecs
...
The configured/base fetch refspecs need to be taken into account in
order to implement opportunistic remote-tracking branch updates. DWIM
them and store them in the struct, but don't do anything with them yet.
2014-09-30 15:42:32 +02:00
Carlos Martín Nieto
c300d84a64
remote: don't DWIM refspecs unnecessarily
...
We can only DWIM when we've connected to the remote and have the list of
the remote's references. Adding or setting the refspecs should not
trigger an attempt to DWIM the refspecs as we typically cannot do it,
and even if we did, we would not use them for the current fetch.
2014-09-30 15:42:32 +02:00
Carlos Martín Nieto
9c206a2248
remote: use active refspec override in the tests
...
This lets us test this bit as well as getting closer to what they were
trying to do.
2014-09-30 15:42:32 +02:00
Carlos Martín Nieto
3f89420523
remote: allow overriding the refspecs for download and fetch
...
With opportunistic ref updates, git has introduced the concept of having
base refspecs *and* refspecs that are active for a particular fetch.
Let's start by letting the user override the refspecs for download.
2014-09-30 15:42:32 +02:00
Brendan Forster
a2a2332219
the wiki, it is dead
2014-09-30 04:17:08 +02:00
Edward Thomson
4c53489260
Merge pull request #2581 from jacquesg/stash-ignored-directories
...
Stash ignored directories
2014-09-29 14:57:54 -04:00
Edward Thomson
89602a1a23
Merge pull request #2584 from jacquesg/pool-alignment
...
Pool/Index data is not aligned
2014-09-29 10:39:40 -04:00
Edward Thomson
ffe34a7cdc
Merge pull request #2582 from swansontec/master
...
Correctly handle getaddrinfo return result
2014-09-29 10:37:37 -04:00
Edward Thomson
ced843f417
Merge pull request #2559 from libgit2/cmn/free-tls-error
...
global: free the error message when exiting a thread
2014-09-29 10:29:00 -04:00
Jacques Germishuys
7b7aa75f80
Recurse ignored directories when stashing
2014-09-26 13:11:49 +02:00
Jacques Germishuys
0478b7f472
Silence unused return value warning
2014-09-26 12:12:09 +02:00
Jacques Germishuys
5387cfee4c
Ensure patch is initialized to zero, otherwise, the allocated flag may be set
2014-09-26 12:12:09 +02:00
Jacques Germishuys
e640a77c9f
Silence uninitialized warning
2014-09-26 12:12:08 +02:00
Jakub Čajka
7629ea5d8d
Fixed odb foreach test failure for big-endian 64-bit
2014-09-26 12:12:08 +02:00
Jakub Čajka
d99e547173
Fixed merge REUC test for big-endian 64-bit
2014-09-26 12:12:08 +02:00
Jacques Germishuys
ff97778a7a
The raw index buffer content is not guaranteed to be aligned
...
* Ensure alignment by copying the content into a structure on the stack
2014-09-26 12:12:08 +02:00
Jacques Germishuys
ad8c8d9325
Ensure pool data is aligned on an 8 byte boundary
2014-09-25 17:56:56 +02:00
Jacques Germishuys
3aaa5c7b46
Introduce GIT_ALIGN
2014-09-25 12:05:26 +02:00
Carlos Martín Nieto
cb4a956b9c
Merge pull request #2570 from cirosantilli/rm-unused-var
...
Remove unused buf variable from path/core test.
2014-09-25 06:50:44 +02:00
William Swanson
d0cf1040c7
Correctly handle getaddrinfo return result
...
The getaddrinfo function indicates failure with a non-zero return code,
but this code is not necessarily negative. On platforms like Android
where the code is positive, a failed call causes libgit2 to segfault.
2014-09-24 12:01:14 -07:00
Jacques Germishuys
940da54861
Added test for stashing files in ignored directories
2014-09-24 13:24:06 +02:00
Carlos Martín Nieto
2cd3cb8e03
Add a note about cert check in the CHANGELOG
2014-09-24 10:22:03 +02:00
Vicent Marti
14556cbff7
Merge pull request #2567 from cirosantilli/factor-41
...
Factor 40 and 41 constants from source.
2014-09-17 17:13:25 +02:00
Carlos Martín Nieto
6340e8f5d0
travis: another attempt at multiple allowed failures
...
It looks like what Travis wants is a list of hashes, rather than a hash
with a list.
2014-09-17 15:52:01 +02:00
