Miha
b5212858f1
Merge remote-tracking branch 'remotes/upstream/development' into development
2014-03-03 11:40:22 +01:00
Ben Straub
494be429ad
Merge pull request #2144 from linquize/branch-f-current
...
Do not allow git_branch_create() to force update branch
2014-03-02 09:00:00 -06:00
Linquize
1d08b72e4f
Add unit test to show git_branch_create() fails if attempt to force create current branch
2014-03-02 19:14:20 +08:00
Vicent Marti
9776cb84fa
Merge pull request #2143 from libgit2/rb/projects
...
Add project list and update readme
2014-03-01 18:06:49 +01:00
Vicent Marti
06d41826b6
Merge pull request #2146 from libgit2/rb/diff-b2b
...
Add git_diff_buffers and git_patch_from_buffers
2014-02-28 09:40:17 +01:00
Russell Belfer
6789b7a75d
Add buffer to buffer diff and patch APIs
...
This adds `git_diff_buffers` and `git_patch_from_buffers`. This
also includes a bunch of internal refactoring to increase the
shared code between these functions and the blob-to-blob and
blob-to-buffer APIs, as well as some higher level assert helpers
in the tests to also remove redundancy.
2014-02-27 14:13:22 -08:00
Russell Belfer
d88399922f
Fix warnings and code style issues
2014-02-27 14:01:16 -08:00
Linquize
59b1dbcd7a
Do not allow git_branch_create() to force update branch
2014-02-27 23:56:25 +08:00
Russell Belfer
486bc36689
Add project list and update readme
2014-02-26 16:37:08 -08:00
Ben Straub
1574d3884f
Merge pull request #2137 from jru/blame-first-parent
...
Blame first-parent history
2014-02-26 16:58:20 -05:00
Vicent Marti
6b34a4ed13
Merge pull request #2142 from ethomson/ignore_authors
...
Remove "ignore" state from the git.git-authors
2014-02-26 22:50:51 +01:00
Edward Thomson
f2abb72568
Remove "ignore" state from the git.git-authors
2014-02-26 12:39:48 -08:00
Juan Rubén
0276f0f55b
Reset num_parents to 1 only for merge commits
...
Also, correct test case to account for the boundary flag
2014-02-26 19:25:07 +01:00
Miha
3536c168c3
- need_pack was not set to 0 when local fetch was already present causing negotiate_fetch access violation
2014-02-25 14:57:47 +01:00
Miha
300f44125a
- BUGFIX #2133 (@fourplusone) in smart_protocol.c
...
- added MSVC cmake definitions to disable warnings
- general.c is rewritten so it is ansi-c compatible and compiles ok on microsoft windows
- some MSVC reported warning fixes
2014-02-25 11:56:11 +01:00
Vicent Marti
cb81c3a764
Merge pull request #2138 from ethomson/sysdir
...
Move system directory cache out of utils
2014-02-25 10:46:41 +01:00
Vicent Marti
1c8b339d34
Merge pull request #2139 from ethomson/va_copy_warning
...
Include stdarg.h for the va_copy test
2014-02-25 10:43:04 +01:00
Edward Thomson
4f46a98b6e
Remove now-duplicated stdarg.h include
2014-02-24 23:32:25 -08:00
Edward Thomson
ab0af298da
Include stdarg.h for the va_copy test
2014-02-24 21:56:08 -08:00
Edward Thomson
83634d38be
Move system directory cache out of utils
2014-02-24 17:52:38 -08:00
Vicent Marti
98b9366212
Merge pull request #2134 from libgit2/ben/icc
...
Fix Intel compiler warnings
2014-02-24 23:01:01 +01:00
Ben Straub
c8893d1f00
Use a portable cast
2014-02-24 13:39:04 -08:00
Juan Rubén
899bd19a62
Document enumerator and rewording
2014-02-24 21:20:57 +01:00
Ben Straub
b1f2c2e255
Prevent icc warning
2014-02-24 05:33:14 -08:00
Ben Straub
8ac7da796b
Avoid casting warning
2014-02-24 05:32:05 -08:00
Ben Straub
0d8265c8af
Staticize file-local variables
2014-02-24 05:32:05 -08:00
Vicent Marti
f3e44dd64c
Merge pull request #2132 from ethomson/merge_doc
...
Improve documentation for merging
2014-02-24 11:02:42 +01:00
Juan Rubén
9e3b901aeb
Add unit test
2014-02-24 00:09:29 +01:00
Juan Rubén
c7c833947e
Add option to limit blame to first parent
2014-02-23 23:26:12 +01:00
Russell Belfer
5af69ee96a
Merge pull request #2130 from worblehat/development
...
Check if librt exists independent of OS, to be able to exclude librt on ...
2014-02-21 10:06:11 -08:00
Edward Thomson
c254e2b641
Improve documentation for merging
2014-02-21 09:28:15 -08:00
Vicent Marti
f83ef56209
Merge pull request #2129 from arrbee/rb/c89-or-c99
...
Improve C89 compatibility and clarify use of C99 features
2014-02-21 01:33:47 +01:00
Tobias Marquardt
5bda607c37
Check if librt exists independent of OS, to be able to exclude librt on Android builds, even though it is a 'Linux'.
2014-02-21 01:20:31 +01:00
Russell Belfer
72556cc63b
Address PR comments
...
* Make GIT_INLINE an internal definition so it cannot be used in
public headers
* Fix language in CONTRIBUTING
* Make index caps API use signed instead of unsigned values
2014-02-20 14:27:10 -08:00
Russell Belfer
68a19ca9ff
Clarify C compatibility policy
...
and a couple of other minor doc fixups.
2014-02-20 11:26:51 -08:00
Russell Belfer
978a4ed5eb
Make git_oid_equal a non-inline API
2014-02-20 11:00:31 -08:00
Vicent Marti
2dc49ea93c
Merge pull request #2124 from libgit2/better-shallow-errors
...
Improve error propagation in shallow call
2014-02-19 00:21:38 +01:00
Ben Straub
864535cf85
Readability
2014-02-18 14:07:42 -08:00
Ben Straub
9bda5fb8c1
Improve error propagation in shallow call
2014-02-18 14:05:30 -08:00
Vicent Marti
e0ebaaa53e
Merge pull request #2121 from bk2204/ewouldblock
...
Check for EWOULDBLOCK as well as EAGAIN on write.
2014-02-18 18:48:43 +01:00
brian m. carlson
0197d4107a
Check for EWOULDBLOCK as well as EAGAIN on write.
...
On some systems, notably HP PA-RISC systems running Linux or HP-UX,
EWOULDBLOCK and EAGAIN are not the same value. POSIX (and these OSes) allow
EWOULDBLOCK to occur on write(2) (and send(2), etc.), so check explicitly
for this case as well as EAGAIN by defining and using a macro GIT_ISBLOCKED
that considers both.
The macro is necessary because MSYS does not provide EWOULDBLOCK and
compilation fails if an attempt is made to use it unconditionally. On most
systems, where the two values are the same, the compiler will simply
optimize this check out and it will have no effect.
2014-02-16 16:56:37 +00:00
Edward Thomson
dbd2ca356b
Merge pull request #2115 from ethomson/crlf_redux
...
Fix filter test for CRLF->LF issues
2014-02-11 17:27:30 -08:00
Edward Thomson
2a528bc088
Fix filter test for CRLF->LF issues
2014-02-11 19:05:52 -06:00
Vicent Marti
90dd286407
Merge pull request #2114 from ethomson/crlf_redux
...
Never convert CRLF->LF
2014-02-12 01:55:25 +01:00
Edward Thomson
b033f3a3f9
Never convert CRLF->LF
...
Core git performs no conversion on systems that use LF, emulate that.
2014-02-11 16:52:08 -08:00
Russell Belfer
5d195cf76b
Merge pull request #2110 from libgit2/ed/crlf_input
...
Handle `core.autocrlf=input` when checking out
2014-02-11 15:56:04 -08:00
Russell Belfer
b362fbf363
Merge pull request #2111 from libgit2/cmn/cond-fixups
...
Conditional ref update fixups
2014-02-10 10:01:36 -08:00
Carlos Martín Nieto
15284a2c5a
refs: move current_id before the reflog parameters
...
Keep the reflog parameters as the last two, as they're the optional
parameters.
2014-02-10 14:52:28 +01:00
Carlos Martín Nieto
77ad675464
refs: conditional wording fixups
...
This addresses arrbee's concerns about wording in the conditional
reference udpate functions.
2014-02-10 14:38:01 +01:00
Edward Thomson
66b2626c93
core.autocrlf=input w/ text=auto attr to workdir
2014-02-09 13:45:40 -08:00
