|
cfc17dc4
|
2012-06-09T17:43:18
|
|
Add a test showing that git_status_file gets confused by spaces in .gitignore
|
|
e0b110ed
|
2012-06-08T15:17:41
|
|
Merge pull request #744 from arrbee/fix-filemodes
Fix filemode comparison in diffs
|
|
|
ac971ecf
|
2012-06-08T14:08:34
|
|
Better fix for isalpha in drive letter detection
Missed a place that used this and missed git__isalpha
|
|
|
d17db71b
|
2012-06-08T13:56:53
|
|
isalpha is not great for UTF-8
When checking for a drive letter on windows, instead of using
isalpha(), it is better to just check for a..z and A..Z, I think,
particularly because the MS isalpha implementation appears to
assert when given an 0xFF byte.
|
|
|
145e696b
|
2012-06-08T11:56:24
|
|
Minor fixes, cleanups, and clarifications
There are three actual changes in this commit:
1. When the trailing newline of a file is removed in a diff, the
change will now be reported with `GIT_DIFF_LINE_DEL_EOFNL` passed
to the callback. Previously, the `ADD_EOFNL` constant was given
which was just an error in my understanding of when the various
circumstances arose. `GIT_DIFF_LINE_ADD_EOFNL` is deprecated and
should never be generated. A new newline is simply an `ADD`.
2. Rewrote the `diff_delta__merge_like_cgit` function that contains
the core logic of the `git_diff_merge` implementation. The new
version doesn't actually have significantly different behavior,
but the logic should be much more obvious, I think.
3. Fixed a bug in `git_diff_merge` where it freed a string pool
while some of the string data was still in use. This led to
`git_diff_print_patch` accessing memory that had been freed.
The rest of this commit contains improved documentation in `diff.h`
to make the behavior and the equivalencies with core git clearer,
and a bunch of new tests to cover the various cases, oh and a minor
simplification of `examples/diff.c`.
|
|
|
0abd7244
|
2012-06-04T16:17:41
|
|
Fix filemode comparison in diffs
File modes were both not being ignored properly on platforms
where they should be ignored, nor be diffed consistently on
platforms where they are supported.
This change adds a number of diff and status filemode change
tests. This also makes sure that filemode-only changes are
included in the diff output when they occur and that filemode
changes are ignored successfully when core.filemode is false.
There is no code that automatically toggles core.filemode
based on the capabilities of the current platform, so the user
still needs to be careful in their .git/config file.
|
|
80c03754
|
2012-06-08T11:36:49
|
|
Merge pull request #757 from benstraub/development
Tests: wrap 'getenv' and friends for Win32 tests.
|
|
e272efcb
|
2012-06-08T11:24:37
|
|
Tests: wrap 'getenv' and friends for Win32 tests.
|
|
3f035860
|
2012-06-07T22:43:03
|
|
misc: Fix warnings from PVS Studio trial
|
|
|
763b8381
|
2012-06-07T13:22:50
|
|
Fixing rev-parse-induced Travis errors.
|
|
|
6c08e69f
|
2012-06-07T12:30:20
|
|
Merge pull request #669 from nulltoken/topic/reset
Add git_reset()
|
|
|
b9ebcc59
|
2012-06-07T12:29:31
|
|
Merge pull request #684 from benstraub/rev-parse
Rev parse
|
|
|
327dc61f
|
2012-06-07T12:28:08
|
|
Prefer git__free (again).
|
|
edebceff
|
2012-05-01T13:57:45
|
|
Add git_reset()
Currently supports Soft and Mixed modes.
|
|
|
31dda647
|
2012-06-07T12:16:39
|
|
Rename internal function.
|
|
|
cddb8efe
|
2012-06-07T11:34:48
|
|
Merge pull request #704 from nulltoken/topic/blob_fromchunks
Add the ability to create blob given a provider of chunks of bytes
|
|
|
cd445767
|
2012-05-27T15:00:05
|
|
blob: add git_blob_create_fromchunks()
|
|
|
5bb54582
|
2012-06-07T09:44:08
|
|
Merge pull request #752 from nulltoken/fix/warning
Fix compilation warning and failing test
|
|
|
9bc57e56
|
2012-06-07T09:37:23
|
|
Merge pull request #751 from libgit2/8bit-filename-status
git_status_file returns GIT_ENOTFOUND for "域名检测工具.exe" (and similarly named files)
|
|
|
8e60c712
|
2012-06-07T09:50:19
|
|
Fix git_status_file for files that start with a character > 0x7f
git_status_file would always return GIT_ENOTFOUND for these files.
The underlying bug was that git__strcmp_cb, which is used by
git_path_with_stat_cmp to sort entries in the working directory,
compares strings based on unsigned chars (this is confirmed by the
strcmp(3) manpage), while git__prefixcmp, which is used by
workdir_iterator__entry_cmp to search for a path in the working
directory, compares strings based on char. So the sort puts this path at
the end of the list, while the search expects it to be at the beginning.
The fix was simply to make git__prefixcmp compare using unsigned chars,
just like strcmp(3). The rest of the change is just adding/updating
tests.
|
|
|
b9f78cb8
|
2012-06-07T09:49:52
|
|
Ingore clar_main.c.rule
|
|
|
6654dbe3
|
2012-06-07T14:09:25
|
|
tests: fix assertion
|
|
|
6f944ab1
|
2012-06-07T13:36:28
|
|
Fix compilation warning
|
|
|
9ecf860d
|
2012-06-06T13:24:25
|
|
Rename posix wrappers with 'p_' prefix.
|
|
|
1a728066
|
2012-06-06T13:04:08
|
|
Remove 'git__' prefix from a static function.
|
|
|
d6391a62
|
2012-06-06T13:00:12
|
|
Rev-parse: stop referencing freed memory.
Converted an internal utility to return an oid,
rather than a tree entry (whose lifetime is tied
to the parent tree, which was freed before
returning).
|
|
|
36c08022
|
2012-06-06T12:39:29
|
|
Omit failing test on 32-bit machines.
This test is intended to verify that 64-bit
machines can handle parsing dates in 2039 and
beyond, and fails on 32-bit machines. It is now
omitted when run on a 32-bit machine to eliminate
an expected failure.
|
|
|
19d35d52
|
2012-06-06T12:31:48
|
|
Prefer git__free() to free().
|
|
|
8a385c04
|
2012-06-06T12:25:22
|
|
Move git__date_parse declaration to util.h.
|
|
|
2c2cde47
|
2012-06-06T08:41:39
|
|
Fix signatures for tree calls.
|
|
66798ad0
|
2012-06-06T11:00:15
|
|
Don't include arpa/inet.h on Windows
|
|
fdc5c38e
|
2012-06-05T23:03:06
|
|
transports: fix buglet
|
|
|
966fbdcb
|
2012-06-05T13:53:33
|
|
Merge pull request #697 from carlosmn/ssl
Add HTTPS support
|
|
|
eadc0e03
|
2012-06-05T13:41:13
|
|
Merge pull request #747 from nulltoken/topic/init-filemode
Make git_repository_init() value "core.filemode" and "core.ignorecase"
|
|
|
693b23c0
|
2012-06-05T14:29:10
|
|
repository: make git_repository_init() value the core.ignorecase config entry
|
|
|
8fc1e0c8
|
2012-06-05T13:18:29
|
|
Merge pull request #738 from nacho/development
libgit2-glib bindings moved to gnome servers
|
|
|
a146ba9e
|
2012-06-05T22:16:08
|
|
tests: Fix warning with nested comments
|
|
|
2255b60e
|
2012-06-05T13:12:36
|
|
Merge pull request #714 from schu/config-enotfound
config: do not set an error for GIT_ENOTFOUND
|
|
|
56a5000d
|
2012-06-05T12:52:44
|
|
Merge branch 'development' into rev-parse
Conflicts:
src/util.h
tests-clar/refs/branches/listall.c
|
|
|
fac66990
|
2012-06-05T13:56:44
|
|
repository: make git_repository_init() value the core.filemode config entry
|
|
|
01dbe273
|
2012-06-04T15:10:29
|
|
Merge pull request #737 from nulltoken/topic/git_remote_add_refspec
Remotes and refspecs
|
|
|
d27bf665
|
2012-05-30T00:50:39
|
|
remote: Make git_remote_add() generate a default refspec with a force update specifier
|
|
|
8856849c
|
2012-06-04T14:31:53
|
|
Merge pull request #739 from arthurschreiber/fix_remote_connected
Fix git_remote_connected
|
|
|
e267c9fc
|
2012-06-04T06:03:08
|
|
Complete the AUTHORS list.
|
|
e9551e86
|
2012-06-02T16:52:22
|
|
Fix git_close/http_close/local_close to set the transport's connected attribute to 0.
|
|
|
36c88422
|
2012-06-02T16:48:12
|
|
Add a failing test case for git_remote_disconnect/git_remote_connected.
|
|
|
734efe4b
|
2012-06-01T14:18:52
|
|
Rev-parse: implement ":/foo" syntax.
|
|
|
2497106f
|
2012-06-01T11:41:54
|
|
Rev-parse: add test with deeper path.
|
|
1d4dcc4b
|
2012-06-01T11:48:58
|
|
config: set an error message when asked to delete a non-existent key
|
|
|
b183a92f
|
2012-05-31T13:42:58
|
|
Rev-parse: Plug memory leaks.
|
|
36bae3e9
|
2012-05-31T09:56:05
|
|
libgit2-glib bindings moved to gnome servers
|
|
|
244d2f6b
|
2012-05-30T16:52:11
|
|
Rev-parse: add "tag:README" syntax.
|
|
|
dd9e4abc
|
2012-05-30T11:46:42
|
|
Approxidate: use libgit2 naming/calling conventions.
Also use git_time_t (64-bit integer) for time
values, although the 2038 problem is still present
on 32-bit machines.
|
|
|
d05e2c64
|
2012-05-30T00:27:22
|
|
refspec: expose the force update specifier through git_refspec_force() accessor
|
|
|
1835c51f
|
2012-05-29T09:59:55
|
|
Merge pull request #735 from gregier/development
Fix checking for the presence of a flag
|
|
2ab9dcbd
|
2012-05-27T16:47:56
|
|
Fix checking for the presence of a flag
|
|
|
9bea8e85
|
2012-05-27T19:54:53
|
|
filebuf: add git_filebuf_flush()
|
|
|
4c977a61
|
2012-05-26T20:08:04
|
|
Merge pull request #734 from scottjg/travis-mingw
Enable mingw cross-compilation in travis-ci
|
|
64ab0ba7
|
2012-05-26T18:23:54
|
|
Enable mingw cross-compile stage in travis-ci
|
|
|
2eb18449
|
2012-05-26T18:20:33
|
|
Refactor CMakeLists.txt for mingw cross-compile
Two things:
1) By default, Linux CMake puts -fPIC on the link line. So we remove that
for MINGW to avoid warnings that it will be ignored.
2) Similarly, move -fvisibility=hidden flag to be for non-mingw
compilation only to avoid warnings that it will be ignored.
|
|
|
c1318f71
|
2012-05-26T18:16:13
|
|
Use lowercase names for Windows headers
Otherwise we can't cross-compile on Linux.
|
|
|
250b95b2
|
2012-05-26T21:17:08
|
|
ssl: allow skipping the server certificate check
Sometimes it's useful not to perform the check. Allow it to be
configurable.
|
|
|
539e6c13
|
2012-05-26T10:38:24
|
|
Merge pull request #732 from schu/fix-gcc-nonnull
tests-clar/core: fix non-null warning
|
|
|
dbab0459
|
2012-05-26T14:59:07
|
|
tests-clar/core: fix non-null warning
gcc 4.7.0 apparently doesn't see that we won't call setenv with NULL as
second argument.
|
|
|
29ef309e
|
2012-05-25T09:44:56
|
|
Make errors for system and global files consistent
The error codes from failed lookups of system and global files
on Windows were not consistent with the codes returned on other
platforms. This makes the error detection patterns match and
adds a unit test for the various errors.
|
|
|
4728b55a
|
2012-05-24T17:43:17
|
|
Merge pull request #729 from arrbee/fix-728
Fix bugs for status
|
|
|
2a99df69
|
2012-05-24T17:14:56
|
|
Fix bugs for status with spaces and reloaded attrs
This fixes two bugs:
* Issue #728 where git_status_file was not working for files
that contain spaces. This was caused by reusing the "fnmatch"
parsing code from ignore and attribute files to interpret the
"pathspec" that constrained the files to apply the status to.
In that code, unescaped whitespace was considered terminal to
the pattern, so a file with internal whitespace was excluded
from the matched files. The fix was to add a mode to that code
that allows spaces and tabs inside patterns. This mode only
comes into play when parsing in-memory strings.
* The other issue was undetected, but it was in the recently
added code to reload gitattributes / gitignores when they were
changed on disk. That code was not clearing out the old values
from the cached file content before reparsing which meant that
newly added patterns would be read in, but deleted patterns
would not be removed. The fix was to clear the vector of
patterns in a cached file before reparsing the file.
|
|
|
a4452eb1
|
2012-05-24T15:12:18
|
|
Merge pull request #727 from libgit2/env-expansion
windows: Properly expand all environment variables
|
|
|
9cde607c
|
2012-05-24T15:08:55
|
|
Clean up system file finding tests on Win32
|
|
|
349fb6d7
|
2012-05-24T23:04:41
|
|
windows: Properly expand all environment variables
|
|
|
5f60fd00
|
2012-05-24T13:56:03
|
|
Merge pull request #726 from arrbee/utf16-home-dir
Get user's home dir in UTF-16 clean manner
|
|
|
9e35d7fd
|
2012-05-24T13:44:24
|
|
Fix bugs in UTF-8 <-> UTF-16 conversion
The function to convert UTF-16 to UTF-8 was only allocating a
buffer of wcslen(utf16str) bytes for the UTF-8 string, but that
is not sufficient if you have multibyte characters, and so when
those occured, the conversion was failing. This updates the
conversion functions to use the Win APIs to calculate the correct
buffer lengths.
Also fixes a comparison in the unit tests that would fail if
you did not have a particular environment variable set.
|
|
|
d3e9c4a5
|
2012-05-24T21:49:43
|
|
repository: default to core.bare = false if it's not set
We used to consider a missing core.bare option to mean that the
repository was corrupt. This is too strict. Consider it a non-bare
repository if it's not set.
|
|
|
23059130
|
2012-05-24T12:45:20
|
|
Get user's home dir in UTF-16 clean manner
On Windows, we are having problems with home directories
that have non-ascii characters in them. This rewrites the
relevant code to fetch environment variables as UTF-16 and
then explicitly map then into UTF-8 for our internal usage.
|
|
|
7eeec8f2
|
2012-05-24T16:41:53
|
|
examples/network: consistently use tabs for indentation
|
|
|
88bfe790
|
2012-05-24T13:38:25
|
|
README: use docs/rel-notes/ for the release notes
|
|
|
87ac556f
|
2012-05-23T15:05:03
|
|
Merge pull request #720 from nulltoken/fix/libgit2sharp_issue_153
Make git_futils_mkdir_r() able to cope with Windows network paths
|
|
|
c4c9de6a
|
2012-05-23T15:03:07
|
|
Merge pull request #712 from waywardmonkeys/embedded_makefile_fixes
Embedded makefile fixes
|
|
|
25804185
|
2012-05-23T15:01:52
|
|
Merge pull request #716 from scottjg/examples-cleanup
Build fixes for examples/
|
|
|
33593265
|
2012-05-23T10:10:04
|
|
Merge pull request #723 from carlosmn/rel-notes
Add notice about release notes
|
|
|
0f4d78d2
|
2012-05-23T17:12:14
|
|
README: add rules about writing release notes as they happen
|
|
|
902bfd31
|
2012-05-23T16:42:02
|
|
CONVENTIONS: Update error code names
|
|
|
8bf10dba
|
2012-05-23T12:59:21
|
|
Remove left-over debugging output
|
|
|
dc07184f
|
2012-05-23T12:05:48
|
|
fileops: Make git_futils_mkdir_r() able to cope with Windows network paths
Partially fix libgit2/libgit2sharp#153
|
|
|
62986ff6
|
2012-05-20T00:46:48
|
|
Add CMake build for examples / add them to Travis
By default, they are still not built, but hopefully, now that Travis is
building them, this will help stave off some of the bitrot.
|
|
|
ab4aa138
|
2012-05-20T00:40:31
|
|
Fix examples/general.c compilation
git_reference_listall() -> git reference_list()
|
|
|
7a361e93
|
2012-05-19T10:48:15
|
|
Merge pull request #715 from schu/cleanup-misc
Cleanup
|
|
|
e203e9d4
|
2012-05-19T18:13:38
|
|
config: do not set an error for GIT_ENOTFOUND
An unset config variable isn't bad per se -- let the call site set an
error in case GIT_ENOTFOUND isn't acceptable.
|
|
|
54db1a18
|
2012-05-19T13:20:55
|
|
Cleanup
* indexer: remove leftover printf
* commit: remove unused macros COMMIT_BASIC_PARSE, COMMIT_FULL_PARSE
and COMMIT_PRINT
|
|
|
441df990
|
2012-05-17T23:57:30
|
|
ssl: look up the last CN the alternative names don't match
|
|
|
3f9eb1e5
|
2012-05-17T22:22:05
|
|
ssl: add support for certificates issues to an IP address
|
|
|
d3e1367f
|
2012-05-17T21:40:20
|
|
ssl: remove GnuTLS support
It's too much work for now to redo everything.
Move the ssl context struct to transport.h
|
|
|
16768191
|
2012-05-17T21:16:59
|
|
ssl: match host names according to RFC 2818 (HTTP over TLS)
|
|
|
dbb36e1b
|
2012-05-17T17:56:49
|
|
ssl: check certificates against the system's trusted CAs
|
|
|
89460f3f
|
2012-05-03T14:07:55
|
|
ssl: teardown the connection on close
This should help us free some resources, though the libraries do keep
some buffers allocated regardless.
|
|
|
a6f24a5b
|
2012-05-01T01:50:26
|
|
https: make it work with OpenSSL as well
Add specific functions that use OpenSSL instead of GnuTLS
|
|
|
66024c7c
|
2012-05-01T00:05:25
|
|
http: add https support when GnuTLS is available
If it's not available, an error saying so will be returned when trying
to use a https:// URL.
This also unifies a lot of the network code to use git_transport in
many places instead of an socket descriptor.
|
|
|
f7ed0c34
|
2012-05-19T07:10:22
|
|
Merge pull request #713 from waywardmonkeys/spelling
Fix spelling errors.
|
|
d73c94b2
|
2012-05-19T20:24:55
|
|
Fix spelling errors.
|
|
|
8e1742ab
|
2012-05-19T18:06:19
|
|
Allow passing additional defines and cflags to Makefile.embed.
|