Vicent Martí
e544a5b8e5
Merge pull request #1968 from libgit2/ntk/fix/bad_index
...
Corrupted index is bad for your health
2013-11-19 04:54:31 -08:00
nulltoken
bd15b51305
index: Free the index on git_index_open() failure
2013-11-19 13:25:39 +01:00
nulltoken
a5d7318802
tree-cache: Fix error message typo
2013-11-19 13:25:38 +01:00
nulltoken
3d5233455b
tree-cache: Don't segfault upon corruption
2013-11-19 13:25:37 +01:00
nulltoken
82e6a42c6c
tree-cache: Zero out the allocated tree children array
2013-11-19 13:25:25 +01:00
nulltoken
7b69289f4e
tree-cache: Free the tree upon the detection of a corrupted child
2013-11-19 13:25:16 +01:00
Vicent Martí
7135e77a62
Merge pull request #1967 from victorgp/cleaning-code-minor-change
...
Cleaning code, removing unused variables
2013-11-19 03:13:23 -08:00
Victor Garcia
10b6678f94
cleaning code, removing unused variables
2013-11-19 11:57:32 +01:00
Nick Hengeveld
d8e7ffc2a2
Add content offset to git_diff_line
...
For additions and deletions, external consumers like subversion
can make use of the content offset to generate diffs in their
proprietary formats.
2013-11-18 14:03:25 -08:00
Carlos Martín Nieto
e1ce5249e5
netops: fix leak
2013-11-18 21:40:19 +01:00
Russell Belfer
8f2a3d6251
Fix warnings
2013-11-18 12:14:50 -08:00
Vicent Martí
8ea7472e08
Merge pull request #1960 from ethomson/ntlm
...
NTLM/Negotiate support in WinHTTP
2013-11-18 11:49:51 -08:00
Edward Thomson
84efffc33a
Introduce git_cred_default for NTLM/SPNEGO auth
2013-11-18 12:56:35 -05:00
Edward Thomson
80fc7d6bf0
Propagate auth error codes as GIT_EUSER in winhttp
2013-11-18 12:56:34 -05:00
Vicent Martí
872094441c
Merge pull request #1963 from libgit2/ntk/fix/mailmap
...
Add missing mappings to .mailmap file
2013-11-15 07:13:50 -08:00
nulltoken
a0f13ffaee
Add missing mappings to .mailmap file
2013-11-15 14:33:23 +00:00
Vicent Martí
845eed800a
Merge pull request #1962 from libgit2/rename-tests
...
Rename tests directory
2013-11-14 14:26:15 -08:00
Ben Straub
83e1efbf46
Update files that reference tests-clar
2013-11-14 14:10:32 -08:00
Ben Straub
1782038144
Rename tests-clar to tests
2013-11-14 14:05:52 -08:00
Vicent Martí
7b947bf5cc
Merge pull request #1951 from victorgp/create-remote-plus-fetch
...
Allowing create remotes with custom fetch spec
2013-11-14 07:21:47 -08:00
Russell Belfer
98eaf39a87
Fix warnings
2013-11-13 11:12:31 -08:00
Carlos Martín Nieto
cfd16ca28e
tests: make a few globals statics
...
ld was warning that the size of path changed, rightly so.
2013-11-13 13:08:56 +01:00
Vicent Martí
6481e06258
Merge pull request #1958 from libgit2/blame-fixes
...
Blame fixes
2013-11-13 01:41:09 -08:00
Ben Straub
4320bec09b
Minor cleanup
2013-11-12 19:02:34 -08:00
Ben Straub
b20c40a8d6
Don't leak memory when duplicating a NULL signature
2013-11-12 19:02:28 -08:00
Ben Straub
9db56cc4a7
Fix buffer blame with new lines at end of file
2013-11-12 18:57:16 -08:00
Ben Straub
089297b2cd
Duplicate all fields of a blame hunk
2013-11-12 15:24:59 -08:00
Ben Straub
f6f7537cfd
Add some failing blame test cases
2013-11-12 15:24:05 -08:00
Vicent Martí
42593a6965
Merge pull request #1957 from linquize/warning3
...
Fix warnings
2013-11-12 04:52:11 -08:00
Linquize
fb190bbbd0
Fix warnings
2013-11-12 19:46:25 +08:00
Vicent Martí
6414fd338d
Merge pull request #1956 from libgit2/cmn/fetch-default-head
...
Remote revamp (director's cut)
2013-11-11 06:47:15 -08:00
Carlos Martín Nieto
a6192d7c98
remote: update head list on push
...
A previous commit forgot to update the head list after push as well,
leading to wrong output of git_remote_ls().
2013-11-11 15:35:52 +01:00
Carlos Martín Nieto
ae2972122e
tests: update push tests
...
These tests were forgotten when modifying git_remote_ls().
2013-11-11 15:35:52 +01:00
Carlos Martín Nieto
877cde765a
remote: let's at least pretend to have some memory safety
...
Copy the pointers into temporary vectors instead of assigning them tot
he same array so we don't mess up with someone else's memory by
accident (e.g. by sorting).
2013-11-11 15:35:52 +01:00
Carlos Martín Nieto
1c967df31c
remote: fix a couple of leaks
2013-11-11 15:35:52 +01:00
Carlos Martín Nieto
359dce726d
remote: make _ls return the list directly
...
The callback-based method of listing remote references dates back to the
beginning of the network code's lifetime, when we didn't know any
better.
We need to keep the list around for update_tips() after disconnect() so
let's make use of this to simply give the user a pointer to the array so
they can write straightforward code instead of having to go through a
callback.
2013-11-11 15:35:51 +01:00
Carlos Martín Nieto
266af6d819
remote: don't allow such direct access to the refspecs
...
Removing arbitrary refspecs makes things more complex to reason
about. Instead, let the user set the fetch and push refspec list to
whatever they want it to be.
2013-11-10 22:21:25 +01:00
Vicent Martí
5e1281f873
Merge pull request #1955 from linquize/trivial.c-warning
...
Fix warning in tests-clar/merge/workdir/trivial.c
2013-11-10 08:19:32 -08:00
Linquize
18bd73e50d
Fix warning in tests-clar/merge/workdir/trivial.c
2013-11-11 00:08:54 +08:00
Vicent Marti
a1d35ede18
config_file: style
2013-11-10 16:41:41 +01:00
Vicent Martí
b9cb72c28a
Merge pull request #1950 from csware/quote-config-values
...
Correctly quote config values while saving
2013-11-10 07:33:11 -08:00
Vicent Martí
0df96f2b05
Merge pull request #1936 from libgit2/better-url-parsing
...
Streamline url-parsing logic.
2013-11-10 07:31:21 -08:00
Victor Garcia
886cc44738
fixing typo
2013-11-08 15:42:52 +01:00
Victor Garcia
40b99d05b4
splitting funcionality in two methods to avoid ambiguity with NULL
2013-11-08 12:14:31 +01:00
Vicent Martí
4cb3c7abe1
Merge pull request #1953 from ethomson/packfile_example
...
update example to new packfile creation signature
2013-11-07 10:11:26 -08:00
Edward Thomson
ad62f2eedc
update example to new packfile creation signature
2013-11-07 12:00:43 -06:00
Vicent Martí
7be892114c
Merge pull request #1952 from ethomson/packfile_mode
...
Allow callers to set mode on packfile creation
2013-11-07 09:22:01 -08:00
Edward Thomson
1e60e5f42d
Allow callers to set mode on packfile creation
2013-11-07 12:04:32 -05:00
Vicent Martí
9018a453ea
Merge pull request #1949 from ethomson/packbuilder_oid
...
Add git_packbuilder_hash to query pack filename
2013-11-07 08:52:32 -08:00
Sven Strickroth
590c5efb3b
Rename method
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-07 17:51:43 +01:00
