|
a47cfd22
|
2012-06-14T19:11:13
|
|
Merge branch 'development' into pull-req
|
|
|
d043013f
|
2012-06-14T19:09:42
|
|
More changes resulting from pull request
|
|
|
a8df98c6
|
2012-06-14T18:57:24
|
|
Updates from comments on OS4 compatibility pull request http://github.com/libgit2/libgit2/pull/766
|
|
|
17b45d80
|
2012-06-13T23:43:25
|
|
Removed hardcoded CMAKE_SYSTEM_NAME
|
|
|
a21bb1aa
|
2012-06-13T23:28:51
|
|
Merge remote-tracking branch 'source/development' into development
|
|
|
96ef3d84
|
2012-06-13T23:16:14
|
|
Make this more generic and mergeable.
Needs AmigaOS.cmake now from CMake package at OS4Depot, or contents below:
--8<--
SET(AMIGA 1)
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
--8<--
|
|
86ea6ced
|
2012-06-13T14:35:11
|
|
Merge pull request #765 from benstraub/msvc-pch
Precompile headers for MSVC.
|
|
73aaf674
|
2012-06-13T14:22:33
|
|
Precompile headers for MSVC.
|
|
|
53774eb8
|
2012-06-13T08:59:32
|
|
Merge pull request #764 from sleeper/issue_763
Fix issue #763
|
|
fa45d25f
|
2012-06-13T14:03:48
|
|
Fix issue #763
|
|
|
2aeadb9c
|
2012-06-12T19:25:09
|
|
Actually do the mmap... unsurprisingly, this makes the indexer work on SFS
On RAM: the .idx and .pack files become links to a .lock and the original download respectively.
Assume some feature (such as record locking) supported by SFS but not JXFS or RAM: is required.
|
|
64e56478
|
2012-06-12T09:29:56
|
|
Merge pull request #760 from nulltoken/topic/logAllRefUpdates
make git_repository_init() value the core.logallrefupdates config entry
|
|
14ebe518
|
2012-06-12T15:23:00
|
|
Expose git_refspec_parse()
This function has been available for some time, but never in a
header. Expose it so we can use it from outside the library.
|
|
c0734593
|
2012-06-12T11:33:46
|
|
revparse: remove unnecessary GIT_BEGIN_DECL
|
|
976b69bd
|
2012-06-11T11:06:53
|
|
repository: widen test coverage regarding initialization and configuration entries
|
|
|
7623b1b6
|
2012-06-11T11:33:13
|
|
repository: make git_repository_init() value the core.logallrefupdates config entry
|
|
|
471fa05e
|
2012-06-11T15:38:33
|
|
Fix fragile commit parsing in revwalk
|
|
|
0284a219
|
2012-06-11T12:55:36
|
|
Fix mingw32 (Travis) build.
|
|
|
80779ea8
|
2012-06-11T09:26:42
|
|
Merge pull request #759 from libgit2/ignore-line-containing-space
git_status_file returns GIT_ENOTFOUND for files in "foo/" when .gitignore contains "foo bar.txt"
|
|
|
9939e602
|
2012-06-11T09:24:02
|
|
Ignores allow unescapes internal whitespace
|
|
|
90490113
|
2012-06-10T18:08:15
|
|
Basic mmap/munmap compatiblity
|
|
|
c9f79972
|
2012-06-09T23:13:21
|
|
remove errorneous comment
|
|
|
c3fad0ae
|
2012-06-09T23:06:32
|
|
Merge branch 'development' of github.com:chris-y/libgit2 into development
|
|
|
41cbbea8
|
2012-06-09T23:03:27
|
|
Let platform 'Generic' get the regex deps so we don't need to use our external ones
|
|
cfc17dc4
|
2012-06-09T17:43:18
|
|
Add a test showing that git_status_file gets confused by spaces in .gitignore
|
|
|
7d1983eb
|
2012-06-09T18:58:11
|
|
stop readdir parsing crashing
|
|
|
327fb51c
|
2012-06-09T18:13:07
|
|
Fix gethostbyname compatibility
|
|
|
b9bfc768
|
2012-06-09T17:33:08
|
|
pre-compiled sha1ppc.S.obj file with nasty CMake hack instructions as the cross-compile process refuses to build and link this file itself.
|
|
|
5c0fd7b9
|
2012-06-09T13:20:07
|
|
allow disabling pthreads for testing
|
|
|
bb502fa8
|
2012-06-09T12:52:49
|
|
Fix makefile
|
|
|
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.
|
|
|
4c650c2b
|
2012-06-08T19:55:04
|
|
Don't use the PPC native SHA1 :( CMake is refusing to acknowledge the sha1ppc.S ppc asm code.
|
|
|
c3f7a938
|
2012-06-08T19:37:24
|
|
Re-add the ability to select the PowerPC SHA1 function
|
|
|
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.
|
|
|
fa56478f
|
2012-06-08T19:15:11
|
|
Generic needs compat files
|
|
|
aa5a92d1
|
2012-06-08T18:57:35
|
|
OS4 compatibility
|
|
|
51975727
|
2012-06-07T23:13:39
|
|
Fix double-defines when using GIT_OLD_ERRORS
|
|
|
0f5e1f3b
|
2012-06-07T21:56:19
|
|
Network byte order is big-endian - the way it should be :)
|
|
3f035860
|
2012-06-07T22:43:03
|
|
misc: Fix warnings from PVS Studio trial
|
|
|
6b5db63c
|
2012-06-07T21:40:07
|
|
random page size for os4
|
|
|
c41fc475
|
2012-06-07T21:26:39
|
|
horrid gethostbyname compatibility
|
|
|
763b8381
|
2012-06-07T13:22:50
|
|
Fixing rev-parse-induced Travis errors.
|
|
|
2774ccb8
|
2012-06-07T20:40:34
|
|
no fnmatch.h
|
|
|
fb0b1523
|
2012-06-07T20:40:03
|
|
force disable of openssl, confusing cross-compiler
|
|
|
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
|
|
|
c3f35902
|
2012-06-07T20:29:22
|
|
Merge remote-tracking branch 'source/development' into update-test
Merging main libgit2!
Conflicts:
CMakeLists.txt
src/unix/map.c
|
|
|
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
|
|
|
cada414a
|
2012-06-05T12:07:08
|
|
OS4 is PPC
|
|
|
82c23c58
|
2012-06-05T12:06:40
|
|
Assume this is irrelevant for now
|
|
|
d0517805
|
2012-06-05T11:47:17
|
|
Required include for OS4 to typedef int64_t
|
|
bad15056
|
2012-06-05T11:41:43
|
|
Force not to use openssl, as confusing cross-compiler
t to use openssl, as confusing cross-compiler
t to use openssl, as confusing cross-compiler
ss
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: CMakeLists.txt
|
|
|
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
|