Ben Straub
2c90145aad
Fix potential segfault in revparse.
2012-06-19 09:25:55 -07:00
nulltoken
743a4b3bdd
message: Expose git_message_prettify()
...
git_commit() and git_tag() no longer prettify the
message by default. This has to be taken care of
by the caller.
This has the nice side effect of putting the
caller in position to actually choose to strip
the comments or not.
2012-06-19 10:02:22 +02:00
Vicent Martí
68f527c448
Merge pull request #758 from libgit2/config-values-containing-quotes
...
Quotes inside config values don't survive serialization/deserialization
2012-06-18 17:50:12 -07:00
Vicent Marti
8c4c357f18
clar: Fix warnings
2012-06-19 02:43:36 +02:00
Vicent Martí
31eed56b9e
Merge pull request #753 from nulltoken/topic/merge-base-many
...
Expose git_merge_base_many()
2012-06-18 17:36:14 -07:00
Vicent Marti
b93688d06d
Merge remote-tracking branch 'yorah/fix/notes-creation' into development
...
Conflicts:
src/notes.c
2012-06-19 02:33:03 +02:00
Vicent Marti
515a4c7c06
tree: Proper path comparison logic
2012-06-19 00:59:04 +02:00
Tim Clem
ac8eac2f66
Fix compile errors when building on windows
...
Errors were due to not including winsock2 early enough.
2012-06-15 11:25:52 -07:00
Tim Clem
e00b56eb04
Fix broken tests caused by no longer prettifying by default
2012-06-15 10:18:08 -07:00
Tim Clem
e4031cb531
Kill message_prettify - we will export instead
2012-06-15 09:26:56 -07:00
Tim Clem
bc2deed0fb
Don't strip comments (#) from commit messages by default
2012-06-15 09:13:59 -07:00
Chris Young
28606ffb60
Merge branch 'development' into pull-req
2012-06-14 19:16:27 +01:00
Chris Young
66a8b662b4
Fix incorrect revert
2012-06-14 19:15:46 +01:00
Chris Young
a47cfd2211
Merge branch 'development' into pull-req
2012-06-14 19:11:13 +01:00
Chris Young
d043013fea
More changes resulting from pull request
2012-06-14 19:09:42 +01:00
Chris Young
a8df98c6fb
Updates from comments on OS4 compatibility pull request http://github.com/libgit2/libgit2/pull/766
2012-06-14 18:57:24 +01:00
Chris Young
17b45d801d
Removed hardcoded CMAKE_SYSTEM_NAME
2012-06-13 23:43:25 +01:00
Chris Young
a21bb1aa33
Merge remote-tracking branch 'source/development' into development
2012-06-13 23:28:51 +01:00
Chris Young
96ef3d8462
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<--
2012-06-13 23:16:14 +01:00
Vicent Martí
86ea6ceda7
Merge pull request #765 from benstraub/msvc-pch
...
Precompile headers for MSVC.
2012-06-13 14:35:11 -07:00
Ben Straub
73aaf67439
Precompile headers for MSVC.
2012-06-13 14:28:47 -07:00
Carlos Martín Nieto
67d334c1cd
config: add more tests for writing escaped chars
2012-06-13 23:26:00 +02:00
Carlos Martín Nieto
49938cad91
config: correctly escape quotes in the value
...
When a configuration option is set, we didn't check to see whether
there was any escaping needed. Escape the available characters so we
can unescape them correctly when we read them.
2012-06-13 23:26:00 +02:00
Adam Roben
750be86aed
Add a test that shows we don't preserve quotes in config values
2012-06-13 21:43:34 +02:00
Vicent Martí
53774eb818
Merge pull request #764 from sleeper/issue_763
...
Fix issue #763
2012-06-13 08:59:32 -07:00
Frederick Ros
fa45d25f38
Fix issue #763
2012-06-13 17:35:13 +02:00
Chris Young
2aeadb9c78
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.
2012-06-12 19:25:09 +01:00
Russell Belfer
64e56478ad
Merge pull request #760 from nulltoken/topic/logAllRefUpdates
...
make git_repository_init() value the core.logallrefupdates config entry
2012-06-12 09:29:56 -07:00
Carlos Martín Nieto
14ebe51832
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.
2012-06-12 15:24:33 +02:00
yorah
027d77ee5c
notes: simplify tests
2012-06-12 14:30:33 +02:00
Michael Schubert
c073459371
revparse: remove unnecessary GIT_BEGIN_DECL
2012-06-12 11:34:01 +02:00
nulltoken
7623b1b63f
repository: make git_repository_init() value the core.logallrefupdates config entry
2012-06-12 06:42:46 +02:00
nulltoken
976b69bdbb
repository: widen test coverage regarding initialization and configuration entries
2012-06-12 06:42:46 +02:00
Russell Belfer
471fa05eb7
Fix fragile commit parsing in revwalk
2012-06-11 15:53:47 -07:00
Ben Straub
0284a21983
Fix mingw32 (Travis) build.
2012-06-11 12:55:36 -07:00
Vicent Martí
80779ea83e
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"
2012-06-11 09:26:42 -07:00
Russell Belfer
9939e602d8
Ignores allow unescapes internal whitespace
2012-06-11 09:24:02 -07:00
Chris Young
90490113af
Basic mmap/munmap compatiblity
2012-06-10 18:08:15 +01:00
Chris Young
c9f79972ba
remove errorneous comment
2012-06-09 23:13:21 +01:00
Chris Young
c3fad0ae35
Merge branch 'development' of github.com:chris-y/libgit2 into development
2012-06-09 23:06:32 +01:00
Chris Young
41cbbea8fe
Let platform 'Generic' get the regex deps so we don't need to use our external ones
2012-06-09 23:05:59 +01:00
Adam Roben
cfc17dc41b
Add a test showing that git_status_file gets confused by spaces in .gitignore
2012-06-09 17:43:18 -04:00
Chris Young
7d1983ebc2
stop readdir parsing crashing
2012-06-09 18:58:11 +01:00
Chris Young
327fb51cec
Fix gethostbyname compatibility
2012-06-09 18:13:07 +01:00
Chris Young
b9bfc7684b
pre-compiled sha1ppc.S.obj file with nasty CMake hack instructions as the cross-compile process refuses to build and link this file itself.
2012-06-09 17:33:08 +01:00
Chris Young
5c0fd7b976
allow disabling pthreads for testing
2012-06-09 13:20:07 +01:00
Chris Young
bb502fa803
Fix makefile
2012-06-09 12:52:49 +01:00
Russell Belfer
e0b110edb1
Merge pull request #744 from arrbee/fix-filemodes
...
Fix filemode comparison in diffs
2012-06-08 15:17:41 -07:00
Russell Belfer
ac971ecfdb
Better fix for isalpha in drive letter detection
...
Missed a place that used this and missed git__isalpha
2012-06-08 14:08:34 -07:00
Russell Belfer
d17db71b6f
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.
2012-06-08 13:56:53 -07:00