|
0cd063fd
|
2012-11-15T23:28:52
|
|
Merge pull request #1071 from arrbee/alternate-fix-strcmp
Win32 fixes for diff/checkout/reset
|
|
96acc0b6
|
2012-11-16T02:30:00
|
|
AUTHORS: cleanup
|
|
|
0ec11828
|
2012-11-16T02:17:57
|
|
Fix -Wmaybe-uninitialized warning
|
|
414bd936
|
2012-11-15T16:20:02
|
|
Include Microsoft in AUTHORS
|
|
4a0c7f56
|
2012-11-15T10:31:11
|
|
Merge pull request #1074 from edubart/ignore_diff_filemode
Add option to ignore file mode in diffs
|
|
|
63f7c6f4
|
2012-11-15T10:18:25
|
|
Merge pull request #1072 from arrbee/diff-api-signatures
Diff API signatures
|
|
c0d5acf6
|
2012-11-15T14:43:21
|
|
Add option to ignore file mode in diffs
|
|
bbe6dbec
|
2012-11-14T23:29:48
|
|
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.
|
|
|
bad68c0a
|
2012-11-13T14:02:59
|
|
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).
|
|
|
5735bf5e
|
2012-11-13T13:58:29
|
|
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.
|
|
|
402b92cf
|
2012-11-14T22:44:17
|
|
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.
|
|
|
cccacac5
|
2012-11-14T22:41:51
|
|
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.
|
|
|
a277345e
|
2012-11-14T22:37:13
|
|
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.
|
|
|
5a36f127
|
2012-11-13T21:14:52
|
|
Merge pull request #1069 from carlosmn/readme
Explain a few CMake options in the README
|
|
66bf4dbc
|
2012-11-13T16:57:37
|
|
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.
|
|
|
7e9f5e65
|
2012-11-13T20:06:15
|
|
Slightly different valgrind fix
Allocate with calloc rather than conditionally memsetting a specific
part of the struct later on.
|
|
|
6132a54e
|
2012-11-13T16:13:10
|
|
Fix a few valgrind errors
|
|
|
513e794e
|
2012-11-13T14:59:18
|
|
Merge pull request #1068 from carlosmn/config-empty-value
Deal with empty and nonexsitent values in config
|
|
|
0da81d2b
|
2012-11-13T14:43:23
|
|
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.
|
|
f6c18dda
|
2012-11-13T14:17:41
|
|
http: Unrustle
|
|
|
aa1c3b58
|
2012-11-13T14:13:47
|
|
Merge pull request #1016 from arrbee/fix-checkout-dir-removal
Update checkout with new strategies & behavior
|
|
|
26227474
|
2012-11-13T14:05:43
|
|
makefile: Fix the builtin Makefile
|
|
|
47db054d
|
2012-11-13T13:41:01
|
|
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.
|
|
|
3ee078c0
|
2012-11-13T13:46:17
|
|
config: rename get_config_entry -> config_entry
We're already in the git_config namespace, there is no need to repeat
it.
|
|
|
3741a37f
|
2012-11-13T13:28:08
|
|
Merge pull request #1055 from ethomson/sha1_win32
Win32 CryptoAPI and CNG support for SHA1
|
|
|
70572ff8
|
2012-11-13T13:26:04
|
|
Merge pull request #1064 from libgit2/http-parser-2
Bump the builtin http-parser to v2.0
|
|
2a612fe3
|
2012-11-13T14:57:35
|
|
filebuf now has a git_hash_ctx instead of a ctx*
|
|
|
a8527429
|
2012-11-13T14:48:10
|
|
unload dll / destroy hash ctxs at shutdown
|
|
|
7ebefd22
|
2012-11-13T10:10:40
|
|
move hash library func ptrs to global global
|
|
|
603bee07
|
2012-11-12T19:22:49
|
|
Remove git_hash_ctx_new - callers now _ctx_init()
|
|
d6fb0924
|
2012-11-05T12:37:15
|
|
Win32 CryptoAPI and CNG support for SHA1
|
|
|
e45423dd
|
2012-11-13T05:45:08
|
|
Merge pull request #1065 from nulltoken/fix/memory-leak
Fix memory leaks
|
|
|
d51e54f1
|
2012-11-13T14:28:44
|
|
Remove unused variables
|
|
4e547eee
|
2012-11-13T07:11:24
|
|
test: fix memory leak
|
|
|
3dee3655
|
2012-11-13T07:04:30
|
|
local: fix memory leak
|
|
|
64ac9548
|
2012-11-12T15:42:03
|
|
Bump the builtin http-parser
|
|
|
9a50026b
|
2012-11-12T15:38:28
|
|
clar-helpers: Oops, grab pointer
|
|
|
19c044a1
|
2012-11-12T14:23:17
|
|
Merge remote-tracking branch 'ben/local-transport' into development
|
|
|
3b44ced0
|
2012-11-12T14:12:41
|
|
Merge pull request #1061 from nulltoken/topic/explicit-head-errors
repository: Refine repository_head() error report
|
|
|
14157652
|
2012-11-12T07:57:03
|
|
Remove unnecessary progress logic
The indexer handles this better than the fetch
logic does.
|
|
|
0f5520f7
|
2012-11-12T07:55:09
|
|
Fix error check
|
|
|
b1a3a70e
|
2012-11-12T00:14:51
|
|
repository: Refine repository_head() error report
|
|
|
ef887151
|
2012-11-11T23:52:37
|
|
Fix compilation warning
|
|
|
e090a568
|
2012-11-11T10:01:11
|
|
Merge pull request #1010 from ethomson/fetch_head
create FETCH_HEAD specially instead of as a ref file
|
|
|
b0f6e45d
|
2012-11-01T15:47:18
|
|
create FETCH_HEAD specially instead of as a ref file
|
|
|
d18713fb
|
2012-11-10T20:24:53
|
|
Merge pull request #1056 from nulltoken/duplicate-tree-entries
Duplicate tree entries
|
|
|
29c16698
|
2012-11-10T20:24:23
|
|
Merge pull request #1060 from nulltoken/topic/explicit-index-errors
Topic/explicit index errors
|
|
|
95d73de1
|
2012-11-10T21:10:49
|
|
index: prefer INDEX_OWNER usage
|
|
|
33f95a9b
|
2012-11-10T21:01:05
|
|
index: refine add_from_workdir() error report
|
|
|
69c068c7
|
2012-11-10T20:42:45
|
|
index: make git_index_new() work with a NULL path
|
|
|
353e9916
|
2012-11-10T16:43:05
|
|
tests: Add missing assertions
|
|
|
2ff1a0d0
|
2012-11-09T16:59:46
|
|
Helpers for local-filesystem remote URLs
|
|
|
757b4065
|
2012-11-09T14:01:44
|
|
Fix warnings and valgrind issues
This fixes some various warnings that showed up in Travis and
a couple uses of uninitialized memory and one memory leak.
|
|
|
0f3def71
|
2012-11-09T11:19:46
|
|
Fix various cross-platform build issues
This fixes a number of warnings and problems with cross-platform
builds. Among other things, it's not safe to name a member of a
structure "strcmp" because that may be #defined.
|
|
|
8064ecba
|
2012-11-09T10:48:25
|
|
Update reset hard test
The `git_reset` API with the HARD option is still slightly
broken, but this test now does exercise the ability of the
command to revert modified files.
|
|
|
a1bf70e4
|
2012-11-08T21:58:24
|
|
fix regression in diff with submodule oid
|
|
|
ad9a921b
|
2012-11-08T17:05:07
|
|
Rework checkout with new strategy options
This is a major reworking of checkout strategy options. The
checkout code is now sensitive to the contents of the HEAD tree
and the new options allow you to update the working tree so that
it will match the index content only when it previously matched
the contents of the HEAD. This allows you to, for example, to
distinguish between removing files that are in the HEAD but not
in the index, vs just removing all untracked files.
Because of various corner cases that arise, etc., this required
some additional capabilities in rmdir and other utility functions.
This includes the beginnings of an implementation of code to read
a partial tree into the index based on a pathspec, but that is
not enabled because of the possibility of creating conflicting
index entries.
|
|
|
55cbd05b
|
2012-11-08T16:56:34
|
|
Some diff refactorings to help code reuse
There are some diff functions that are useful in a rewritten
checkout and this lays some groundwork for that. This contains
three main things:
1. Share the function diff uses to calculate the OID for a file
in the working directory (now named `git_diff__oid_for_file`
2. Add a `git_diff__paired_foreach` function to iterator over
two diff lists concurrently. Convert status to use it.
3. Move all the string/prefix/index entry comparisons into
function pointers inside the `git_diff_list` object so they
can be switched between case sensitive and insensitive
versions. This makes them easier to reuse in various
functions without replicating logic. As part of this, move
a couple of index functions out of diff.c and into index.c.
|
|
|
2e3d4b96
|
2012-11-08T16:47:28
|
|
Move pathspec code in separate files
Diff uses a `git_strarray` of path specs to represent a subset
of all files to be processed. It is useful to be able to reuse
this filtering in other places outside diff, so I've moved it
into a standalone set of utilities.
|
|
|
220d5a6c
|
2012-11-08T16:45:25
|
|
Make iterator ignore eval lazy
This makes it so that the check if a file is ignored will be
deferred until requested on the workdir iterator, instead of
aggressively evaluating the ignore rules for each entry. This
should improve performance because there will be no need to
check ignore rules for files that are already in the index.
|
|
|
18eff2ad
|
2012-11-08T16:44:39
|
|
Clean up a couple things missed in rebase
|
|
|
32def5af
|
2012-10-24T17:37:07
|
|
Fix checkout behavior when its hands are tied
So, @nulltoken created a failing test case for checkout that
proved to be particularly daunting. If checkout is given only
a very limited strategy mask (e.g. just GIT_CHECKOUT_CREATE_MISSING)
then it is possible for typechange/rename modifications to leave it
unable to complete the request. That's okay, but the existing code
did not have enough information not to generate an error (at least
for tree/blob conflicts).
This led me to a significant reorganization of the code to handle
the failing case, but it has three benefits:
1. The test case is handled correctly (I think)
2. The new code should actually be much faster than the old code
since I decided to make checkout aware of diff list internals.
3. The progress value accuracy is hugely increased since I added
a fourth pass which calculates exactly what work needs to be
done before doing anything.
|
|
|
331e7de9
|
2012-10-24T17:32:50
|
|
Extensions to rmdir and mkdir utilities
* Rework GIT_DIRREMOVAL values to GIT_RMDIR flags, allowing
combinations of flags
* Add GIT_RMDIR_EMPTY_PARENTS flag to remove parent dirs that
are left empty after removal
* Add GIT_MKDIR_VERIFY_DIR to give an error if item is a file,
not a dir (previously an EEXISTS error was ignored, even for
files) and enable this flag for git_futils_mkpath2file call
* Improve accuracy of error messages from git_futils_mkdir
|
|
|
8a328cf4
|
2012-11-09T13:19:32
|
|
Merge pull request #1058 from pwkelley/development
Fixes for two segfaults
|
|
|
39d7cf60
|
2012-11-09T13:15:57
|
|
Merge pull request #1059 from nulltoken/fix/config-open-level
config: make git_config_open_level() work with an empty config
|
|
fcd03beb
|
2012-11-09T15:57:32
|
|
Fix a mutex/critical section leak
|
|
|
55f9837f
|
2012-11-09T21:49:50
|
|
config: make git_config_open_level() work with an empty config
|
|
|
2f683f00
|
2012-11-09T15:39:25
|
|
Fix uninitialized memory in winhttp subtransport on 64-bit
|
|
|
2364735c
|
2012-11-09T15:39:10
|
|
Fix implementation of strndup to not overrun
|
|
|
90207709
|
2012-11-08T21:29:17
|
|
Avoid copying duplicate commits
|
|
|
11fabe73
|
2012-11-08T20:18:19
|
|
Local fetch: add tests
|
|
|
505da062
|
2012-11-06T10:26:06
|
|
Implement local transport's fetch
|
|
|
f92bcaea
|
2012-11-08T17:39:23
|
|
index: prevent tree creation from a non merged state
Fix libgit2/libgit2sharp#243
|
|
|
0f674411
|
2012-11-09T06:16:44
|
|
Merge pull request #1052 from delanne/invalid_read
Valgrind reports Invalid Read when the configuration file contains some empty line
|
|
|
4d062d25
|
2012-11-09T06:15:37
|
|
Merge pull request #1057 from bts/patch-1
Update documentation in remote.h
|
|
b0b80658
|
2012-11-08T21:28:15
|
|
Update documentation in remote.h
|
|
|
7cc1bf0f
|
2012-11-08T21:08:59
|
|
index: Introduce git_index_has_conflicts()
|
|
|
29cc374d
|
2012-11-08T17:37:01
|
|
tree: enforce coverage of silent entry replacement
|
|
|
9d641283
|
2012-11-08T08:06:23
|
|
Merge pull request #1048 from pwkelley/basic_auth
Basic authentication for http and winhttp
|
|
bcad677b
|
2012-11-08T12:28:21
|
|
- Update 'tests-clar/resources/config/config11' in order to reproduce the invalidread with the unittest (just added some \n at the end of the file)
- Fix config_file.c
|
|
|
8ff2b0c7
|
2012-11-07T16:30:55
|
|
Merge pull request #1039 from erikvanzijst/erik/tag_without_message
Correctly parse tags lacking a description
|
|
|
721571cc
|
2012-11-07T12:58:54
|
|
Merge pull request #1050 from edubart/development
Fix compilation for mingw32 and cygwin
|
|
|
345eef23
|
2012-11-07T16:10:57
|
|
Move inet_pton to posix platform-compatibility layer
|
|
|
d1a69d0f
|
2012-11-06T20:16:53
|
|
Fix compilation for mingw32 and cygwin
inet_pton is available only in windows vista or later,
fixed the issue by reimplementing it using WSAStringToAddress
|
|
|
11fa8472
|
2012-11-06T11:27:23
|
|
Don't store no_check_cert; fetch it on demand
|
|
|
8a853788
|
2012-11-06T07:32:29
|
|
Merge pull request #1025 from ethomson/fetchodb
fetch: Write packs to the ODB instead of directly to disk
|
|
|
2f7538ec
|
2012-11-06T09:36:04
|
|
Fix connection leak in http subtransport
|
|
|
091361f5
|
2012-11-06T08:52:03
|
|
Basic authentication for http and winhttp
|
|
|
09cc0b92
|
2012-11-05T11:33:10
|
|
create callback to handle packs from fetch, move the indexer to odb_pack
|
|
|
a5e85d86
|
2012-11-05T11:06:50
|
|
Merge pull request #1046 from libgit2/empty-remote-url-crash
Bail out of remote loading if the URL would be NULL
|
|
c1cd036e
|
2012-11-05T11:01:00
|
|
'geterr' -> 'giterr'
|
|
|
6edefa14
|
2012-11-05T10:58:08
|
|
Revert "Don't expect the 'empty-remote-url' remote to be listed"
Apparently git_remote_list() includes even remotes for which git_remote_load() would fail. Sorry @nulltoken, false alarm.
This reverts commit f358ec143c8c9952227d31cd21c24f8c9be23d3c.
|
|
|
f358ec14
|
2012-11-05T10:45:26
|
|
Don't expect the 'empty-remote-url' remote to be listed
CC @nulltoken
|
|
|
1fe99aee
|
2012-11-05T10:44:48
|
|
Test for GITERR_INVALID
|
|
|
065be7a1
|
2012-11-05T10:44:21
|
|
Merge pull request #1044 from dahlbyk/repo/state
Fix state when HEAD is not detached
|
|
|
f8baece7
|
2012-11-05T10:42:10
|
|
Set GITERR_INVALID when encountering a NULL remote URL
|
|
|
942a7698
|
2012-11-05T06:54:34
|
|
Merge pull request #1034 from carlosmn/packbuilder-foreach
Let the user grab the packfile as it's being written
|
|
|
a2a61894
|
2012-11-05T07:49:37
|
|
remote: Add malformed remote load test
|
|
|
83885891
|
2012-11-04T22:01:24
|
|
Bail out if remote->url would be NULL
This fixes a crash from attempting to invoke git__strdup() against NULL.
|
|
221ee54b
|
2012-11-04T21:24:14
|
|
Fix Clar link
|