Scott J. Goldman
0cd063fd87
Merge pull request #1071 from arrbee/alternate-fix-strcmp
...
Win32 fixes for diff/checkout/reset
2012-11-15 23:28:52 -08:00
Michael Schubert
96acc0b615
AUTHORS: cleanup
2012-11-16 02:37:26 +01:00
Michael Schubert
0ec118280c
Fix -Wmaybe-uninitialized warning
2012-11-16 02:17:57 +01:00
Ben Straub
414bd93667
Include Microsoft in AUTHORS
2012-11-15 16:20:02 -08:00
Vicent Martí
4a0c7f56ab
Merge pull request #1074 from edubart/ignore_diff_filemode
...
Add option to ignore file mode in diffs
2012-11-15 10:31:11 -08:00
Vicent Martí
63f7c6f4c8
Merge pull request #1072 from arrbee/diff-api-signatures
...
Diff API signatures
2012-11-15 10:18:25 -08:00
Eduardo Bart
c0d5acf69a
Add option to ignore file mode in diffs
2012-11-15 14:59:39 -02:00
Russell Belfer
bbe6dbec81
Add explicit git_index ptr to diff and checkout
...
A number of diff APIs and the `git_checkout_index` API take a
`git_repository` object an operate on the index. This updates
them to take a `git_index` pointer explicitly and only fall back
on the `git_repository` index if the index input is NULL. This
makes it easier to operate on a temporary index.
2012-11-14 23:29:48 -08:00
Russell Belfer
bad68c0a99
Add iterator for git_index object
...
The index iterator could previously only be created from a repo
object, but this allows creating an iterator from a `git_index`
object instead (while keeping, though renaming, the old function).
2012-11-14 22:55:40 -08:00
Russell Belfer
5735bf5e6a
Fix diff API to better parameter order
...
The diff API is not in the parameter order one would expect from
other libgit2 APIs. This fixes that.
2012-11-14 22:54:31 -08:00
Russell Belfer
402b92cfe9
Fix reset hard tests on platforms with CRLF
...
The reset hard tests had hardcoded expected file content and was
not correctly compensating for CRLF filtering when a file needed
to be reverted by the reset hard. This fixes that.
2012-11-14 22:44:17 -08:00
Russell Belfer
cccacac555
Add POSIX compat lstat() variant for win32
...
The existing p_lstat implementation on win32 is not quite POSIX
compliant when setting errno to ENOTDIR. This adds an option to
make is be compliant so that code (such as checkout) that cares
to have separate behavior for ENOTDIR can use it portably.
This also contains a couple of other minor cleanups in the
posix_w32.c implementations to avoid unnecessary work.
2012-11-14 22:41:51 -08:00
Russell Belfer
a277345e05
Create internal strcmp variants for function ptrs
...
Using the builtin strcmp and strcasecmp as function pointers is
problematic on win32. This adds internal implementations and
divorces us from the platform linkage.
2012-11-14 22:37:13 -08:00
Vicent Martí
5a36f12780
Merge pull request #1069 from carlosmn/readme
...
Explain a few CMake options in the README
2012-11-13 21:14:52 -08:00
Carlos Martín Nieto
66bf4dbc68
Explain a few CMake options in the README
...
Expose STDCALL and explain a few useful CMake options, as well as
explain the quirks building on Windows.
2012-11-13 20:57:19 -08:00
Carlos Martín Nieto
7e9f5e6500
Slightly different valgrind fix
...
Allocate with calloc rather than conditionally memsetting a specific
part of the struct later on.
2012-11-13 20:06:15 -08:00
Carlos Martín Nieto
6132a54e0b
Fix a few valgrind errors
2012-11-13 16:17:37 -08:00
Vicent Martí
513e794ef4
Merge pull request #1068 from carlosmn/config-empty-value
...
Deal with empty and nonexsitent values in config
2012-11-13 14:59:18 -08:00
Carlos Martín Nieto
0da81d2b39
config: return an emtpy string when there is no value
...
Returning NULL for the string when we haven't signaled an error
condition is counter-intuitive and causes unnecessary edge
cases. Return an empty string when asking for a string value for a
configuration variable such as '[section] var' to avoid these edge
cases.
If the distinction between no value and an empty value is needed, this
can be retrieved from the entry directly. As a side-effect, this
change stops the int parsing functions from segfaulting on such a
variable.
2012-11-13 14:49:16 -08:00
Vicent Marti
f6c18dda04
http: Unrustle
2012-11-13 14:17:41 -08:00
Vicent Martí
aa1c3b588e
Merge pull request #1016 from arrbee/fix-checkout-dir-removal
...
Update checkout with new strategies & behavior
2012-11-13 14:13:47 -08:00
Vicent Marti
262274748f
makefile: Fix the builtin Makefile
2012-11-13 14:05:43 -08:00
Carlos Martín Nieto
47db054df0
config: distinguish between a lone variable name and one without rhs
...
'[section] variable' and '[section] variable =' behave differently
when parsed as booleans, so we need to store that distinction
internally.
2012-11-13 13:53:41 -08:00
Carlos Martín Nieto
3ee078c0f7
config: rename get_config_entry -> config_entry
...
We're already in the git_config namespace, there is no need to repeat
it.
2012-11-13 13:46:17 -08:00
Vicent Martí
3741a37f5e
Merge pull request #1055 from ethomson/sha1_win32
...
Win32 CryptoAPI and CNG support for SHA1
2012-11-13 13:28:08 -08:00
Vicent Martí
70572ff80b
Merge pull request #1064 from libgit2/http-parser-2
...
Bump the builtin http-parser to v2.0
2012-11-13 13:26:04 -08:00
Edward Thomson
2a612fe3c3
filebuf now has a git_hash_ctx instead of a ctx*
2012-11-13 14:57:35 -06:00
Edward Thomson
a8527429dc
unload dll / destroy hash ctxs at shutdown
2012-11-13 14:48:10 -06:00
Edward Thomson
7ebefd22e7
move hash library func ptrs to global global
2012-11-13 10:23:05 -06:00
Edward Thomson
603bee0791
Remove git_hash_ctx_new - callers now _ctx_init()
2012-11-13 10:23:05 -06:00
Edward Thomson
d6fb092409
Win32 CryptoAPI and CNG support for SHA1
2012-11-13 10:23:05 -06:00
Ben Straub
e45423dd2c
Merge pull request #1065 from nulltoken/fix/memory-leak
...
Fix memory leaks
2012-11-13 05:45:08 -08:00
Michael Schubert
d51e54f1f4
Remove unused variables
2012-11-13 14:28:44 +01:00
nulltoken
4e547eee31
test: fix memory leak
2012-11-13 07:12:53 +01:00
nulltoken
3dee36557e
local: fix memory leak
2012-11-13 07:04:30 +01:00
Vicent Marti
64ac9548aa
Bump the builtin http-parser
2012-11-12 15:42:03 -08:00
Vicent Marti
9a50026b19
clar-helpers: Oops, grab pointer
2012-11-12 15:38:28 -08:00
Vicent Marti
19c044a17d
Merge remote-tracking branch 'ben/local-transport' into development
2012-11-12 14:23:17 -08:00
Vicent Martí
3b44ced096
Merge pull request #1061 from nulltoken/topic/explicit-head-errors
...
repository: Refine repository_head() error report
2012-11-12 14:12:41 -08:00
Ben Straub
14157652ee
Remove unnecessary progress logic
...
The indexer handles this better than the fetch
logic does.
2012-11-12 07:57:03 -08:00
Ben Straub
0f5520f73a
Fix error check
2012-11-12 07:55:09 -08:00
nulltoken
b1a3a70ed1
repository: Refine repository_head() error report
2012-11-12 00:14:51 +01:00
nulltoken
ef8871515b
Fix compilation warning
2012-11-12 00:13:02 +01:00
Edward Thomson
e090a5681b
Merge pull request #1010 from ethomson/fetch_head
...
create FETCH_HEAD specially instead of as a ref file
2012-11-11 10:01:11 -08:00
Edward Thomson
b0f6e45d14
create FETCH_HEAD specially instead of as a ref file
2012-11-11 11:56:33 -06:00
Vicent Martí
d18713fb4a
Merge pull request #1056 from nulltoken/duplicate-tree-entries
...
Duplicate tree entries
2012-11-10 20:24:53 -08:00
Vicent Martí
29c16698b2
Merge pull request #1060 from nulltoken/topic/explicit-index-errors
...
Topic/explicit index errors
2012-11-10 20:24:23 -08:00
nulltoken
95d73de15f
index: prefer INDEX_OWNER usage
2012-11-10 21:10:49 +01:00
nulltoken
33f95a9b32
index: refine add_from_workdir() error report
2012-11-10 21:01:05 +01:00
nulltoken
69c068c79f
index: make git_index_new() work with a NULL path
2012-11-10 20:42:45 +01:00