Carlos Martín Nieto
5192bcc52c
Add the OpenSSL changes to the CHANGELOG
...
It seems these were forgotten when initially splitting this up.
2014-12-12 15:46:57 +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
Edward Thomson
4eb97ef3bf
Merge pull request #2756 from libgit2/cmn/push-error-concerns
...
Fold `git_push_unpack_ok()` into `git_push_finish()`
2014-12-10 14:15:15 -05: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
a2fd56ab18
Fix a couple of compiler warnings
2014-12-10 16:22:50 +01:00
Carlos Martín Nieto
49ae22baac
stream: constify the write buffer
2014-12-10 16:20:52 +01:00
Carlos Martín Nieto
3b6a566867
Merge pull request #2755 from libgit2/ntk/readme_appveyor_build
...
Minor Readme improvments
2014-12-10 14:53:12 +01:00
nulltoken
a7e06cb026
readme: Add AppVeyor build status badge/link
2014-12-10 10:11:37 +01:00
nulltoken
037b2a8b00
readme: Make Travis build status badge reflect the state of master
2014-12-10 10:05:04 +01:00
nulltoken
775d831b33
readme: Trim trailing lines
2014-12-10 10:04:34 +01:00
Carlos Martín Nieto
1b75c29e3e
gitno: remove code which is no longer needed
...
Most of the network-facing facilities have been copied to the socket and
openssl streams. No code now uses these functions directly anymore, so
we can now remove them.
2014-12-10 01:39:09 +01:00
Carlos Martín Nieto
4fd4341fe5
ssh: use socket_stream to perform the connection
...
Having an ssh stream would require extra work for stream capabilities we
don't need anywhere else (oob auth and command execution) so for now
let's move away from the gitno connection to use socket_stream.
We can introduce an ssh stream interface if and as we need it.
2014-12-10 01:39:09 +01:00
Carlos Martín Nieto
b6f5464e28
Port HTTP(S) to the new stream API
2014-12-10 01:39:09 +01:00
Carlos Martín Nieto
02b4c1e2a4
Port the TCP transport to the new stream API
2014-12-10 01:39:09 +01:00
Carlos Martín Nieto
0fae039116
Merge pull request #2753 from ethomson/win32_leaks
...
Win32 leaks
2014-12-10 01:29:07 +01:00
Carlos Martín Nieto
468d7b11f9
Add an OpenSSL IO stream
...
This unfortunately isn't as stackable as could be possible, as it
hard-codes the socket stream. This is because the method of using a
custom openssl BIO is not clear, and we do not need this for now. We can
still bring this in if and as we need it.
2014-12-10 01:17:41 +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
ad2bf40a9d
winhttp: plug some leaks
2014-12-09 12:04:55 -05:00
Edward Thomson
6b11eb51ee
core::link test: clean up junction point name
2014-12-09 12:04:53 -05:00
Edward Thomson
80b01c8f26
win32: remember to free wide env name/value
2014-12-09 12:04:50 -05:00
Edward Thomson
c251f3bbe7
win32: remember to cleanup our hash_ctx
2014-12-09 12:04:47 -05:00
Edward Thomson
d5087689b5
Merge pull request #2750 from linquize/generate.py
...
Update clar to e3985dd
2014-12-08 23:03:30 -05:00
Edward Thomson
99cfe9b266
Merge pull request #2751 from linquize/broken-test-win
...
Fix broken tests on Windows
2014-12-08 16:27:58 -05:00
Linquize
8e0aa2ebce
Fix broken merge tests due to autocrlf was not false
2014-12-07 23:41:30 +08:00
Linquize
d226fbf1aa
Fix broken test suite on Windows
2014-12-07 22:42:06 +08:00
Linquize
3a1eb9e5ff
Update clar to e3985dd
2014-12-07 22:09:00 +08:00
Edward Thomson
19ae843937
Merge pull request #2746 from libgit2/cmn/neg-ignore-dir
...
Fix negative ignores withing ignored dirs
2014-12-06 20:17:16 -05: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
Edward Thomson
013924c17c
Merge pull request #2730 from libgit2/cmn/local-push
...
Adjust the local transport for the common refspec parser
2014-12-05 23:44:34 -05:00
Edward Thomson
df86d43cf8
Merge pull request #2747 from libgit2/cmn/notes-consistency
...
Notes API consistency fixes
2014-12-05 23:37:05 -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
Carlos Martín Nieto
e05b2ff127
ignore: match git's rule negation rules
...
A rule can only negate something which was explicitly mentioned in the
rules before it. Change our parsing to ignore a negative rule which does
not negate something mentioned in the rules above it.
While here, fix a wrong allocator usage. The memory for the match string
comes from pool allocator. We must not free it with the general
allocator. We can instead simply forget the string and it will be
cleaned up.
2014-12-05 20:13:24 +01:00
Carlos Martín Nieto
e0a97416d4
ignore: adjust test for negating inside a dir
...
Given
top
!top/foo
in an ignore file, we should not unignore top/foo. This is an
implementation detail of the git code leaking, but that's the behaviour
we should show.
A negation rule can only negate an exact rule it has seen before.
2014-12-05 19:43:36 +01:00
Carlos Martín Nieto
d43c7bd050
Rever spelling fixes for dependencies
...
This is not our code and it adds unecessary changes from the upstream
code.
2014-12-05 08:13:43 +01:00
nulltoken
30ec05260d
Merge pull request #2744 from epmatsw/spelling
...
Spelling fixes
2014-12-05 07:44:09 +01:00
Carlos Martín Nieto
e79fbd9e8a
Merge pull request #2743 from ethomson/init_val
...
init: return the number of initializations
2014-12-05 07:09:08 +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
Carlos Martín Nieto
8bfbe6988f
Merge pull request #2742 from stewid/add_missing_else_directive
...
Add missing else directive
2014-12-03 21:54:44 +01:00
Stefan Widgren
2d2cd625ea
Add missing else directive
...
Add missing else directive to fix compiler warning: control reaches
end of non-void function
2014-12-03 21:01:42 +01:00
Carlos Martín Nieto
792d750bed
Merge pull request #2741 from ethomson/fetch-twice
...
win32: clear connection data on close
2014-12-03 13:38:48 +01:00
Edward Thomson
70d21742bf
win32: clear connection data on close
2014-12-03 00:41:46 -05:00
Edward Thomson
169497d1e7
Merge pull request #2734 from jeffhostetler/jeffhostetler/git_mkfile
...
fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat...
2014-12-01 10:43:11 -05:00
Carlos Martín Nieto
fea15f7c74
Merge pull request #2736 from ethomson/describe_errorcode
...
describe: check error codes
2014-11-30 01:52:22 +01:00
Edward Thomson
32e2b758cf
describe: check error codes
2014-11-29 15:57:35 -05:00
Jeff Hostetler
93aef71e90
fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat()
2014-11-26 14:12:11 -05:00