Vicent Marti
af2b969b6f
Merge pull request #2061 from ethomson/merge_improvements
...
Merge improvements
2014-01-20 16:26:04 -08:00
Edward Thomson
0ef19fe14c
Merge submodules
2014-01-20 18:07:17 -05:00
Edward Thomson
db3462ce77
Support union merges
2014-01-20 17:15:15 -05:00
Edward Thomson
0e1ba46cfb
Remove the "merge none" flag
...
The "merge none" (don't automerge) flag was only to aide in
merge trivial tests. We can easily determine whether merge
trivial resulted in a trivial merge or an automerge by examining
the REUC after automerge has completed.
2014-01-20 17:15:14 -05:00
Edward Thomson
6891a862bb
Load merge.conflictstyle setting from config
2014-01-20 17:15:13 -05:00
Edward Thomson
e651e8e2b5
Introduce diff3 mode for checking out conflicts
2014-01-20 17:15:13 -05:00
Edward Thomson
6b92c99bcb
Don't try to merge binary files
2014-01-20 17:15:12 -05:00
Edward Thomson
c1d648c5c6
merge_file should use more aggressive levels
...
The default merge_file level was XDL_MERGE_MINIMAL, which will
produce conflicts where there should not be in the case where
both sides were changed identically. Change the defaults to be
more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively
compress non-conflicts. This matches git.git's defaults.
Increase testing around reverting a previously reverted commit to
illustrate this problem.
2014-01-20 17:15:11 -05:00
Vicent Marti
e49c98e6ef
Merge pull request #2065 from ethomson/submodule_unmodified
...
"Uninitialized" submodules are "unmodified"
2014-01-20 14:12:41 -08:00
Edward Thomson
b554ca5dc1
"Uninitialized" submodules are "unmodified"
...
Extend the "unmodified" submodule workdir test to include
uninitialized submodules, to prevent reporting submodules as
modified when they're not in the workdir at all.
2014-01-20 17:09:31 -05:00
Russell Belfer
d62bf0bf83
Merge pull request #2063 from linquize/reflog-msg-null
...
git_reflog_entry_message can be null
2014-01-20 10:15:05 -08:00
Russell Belfer
fb62dc9068
Merge pull request #2064 from piki/piki/buffer-corner-cases
...
Fix a couple of corner cases and an undefined behavior
2014-01-20 10:04:20 -08:00
Patrick Reynolds
abdaf93662
add unit tests for git_buf_join corner cases
2014-01-20 11:42:12 -06:00
Patrick Reynolds
7cbc6241cf
fix corner cases and an undefined behavior
2014-01-20 11:41:21 -06:00
Linquize
e7c66fc89b
git_reflog_entry_message can be null
2014-01-20 23:32:18 +08:00
Edward Thomson
b97e55f2f1
Merge pull request #2059 from linquize/git_config_get_crash
...
Fix segfault when calling git_config_get_* functions when a config fails to load
2014-01-18 14:48:59 -08:00
Linquize
c24130e068
Fix segfault when calling git_config_get_* functions when a config fails to load
...
Reinitialize the result code of get_entry() to GIT_ENOTFOUND
2014-01-18 22:58:31 +08:00
Edward Thomson
fed98153ca
Merge pull request #2058 from libgit2/rb/gitdir-windows-paths
...
Convert gitdir paths to posix on Windows
2014-01-17 14:00:48 -08:00
Russell Belfer
6b415f622e
Convert gitdir paths to posix on Windows
...
Apparently, a .git file with "gitdir: path" link on Windows is
allowed to use backslashes in the path. Who knew?
2014-01-17 13:46:44 -08:00
Vicent Marti
b6815fe0d5
Merge pull request #2055 from arthurschreiber/patch-3
...
Fix some documentation issues.
2014-01-16 13:21:20 -08:00
Arthur Schreiber
3f033c5595
Revert a wrong doc change.
2014-01-16 21:53:25 +01:00
Arthur Schreiber
3f0e3e1662
Fix some documentation issues.
2014-01-16 21:42:28 +01:00
Ben Straub
c85d606eee
Merge pull request #2044 from libgit2/coverity
...
Run Coverity scan on Travis
2014-01-16 11:36:06 -08:00
Ben Straub
ba6464b3a8
Merge pull request #2053 from ethomson/bindings
...
Update README to include Java, PowerShell bindings
2014-01-15 14:05:04 -08:00
Edward Thomson
4ef9a50817
Update README to include Java, PowerShell bindings
2014-01-15 13:58:11 -08:00
Ben Straub
998f0016ff
Refine build limitation
2014-01-15 12:32:12 -08:00
Ben Straub
53e6f4804b
Only run coverity on development
2014-01-15 12:12:17 -08:00
Vicent Marti
f04c7dcab4
Merge pull request #2050 from libgit2/cmn/always-reflog-message
...
refs: remove the _with_log differentiation
2014-01-15 11:54:10 -08:00
Carlos Martín Nieto
0b28217bda
refs: remove the _with_log differentiation
...
Any well-behaved program should write a descriptive message to the
reflog whenever it updates a reference. Let's make this more prominent
by removing the version without the reflog parameters.
2014-01-15 13:32:43 +01:00
Vicent Marti
dec1ac755d
Merge pull request #2049 from ethomson/common
...
Common
2014-01-15 03:17:26 -08:00
Edward Thomson
e85bbd5250
Move libgit2 settings out of util
2014-01-14 18:36:00 -08:00
Edward Thomson
39c2302a95
unnecessary include
2014-01-14 18:36:00 -08:00
Vicent Marti
3c1b3ded12
Merge pull request #2047 from arthurschreiber/arthur/fix-dup-functions
...
Align `*_dup` functions
2014-01-14 12:41:01 -08:00
Vicent Marti
30aebe6334
Merge pull request #2048 from arthurschreiber/arthur/add-git_remote_dup
...
Implement @cmn's suggestions for `git_remote_dup`.
2014-01-14 12:40:30 -08:00
Arthur Schreiber
529f342aba
Align git_tree_entry_dup.
2014-01-14 21:33:59 +01:00
Arthur Schreiber
29be3a6d9e
Align git_signature_dup.
...
This changes git_signature_dup to actually honor oom conditions raised by
the call to git__strdup. It also aligns it with the error code return
pattern used everywhere else.
2014-01-14 21:33:35 +01:00
Arthur Schreiber
99dcb2184a
We don't need memset here.
2014-01-14 21:08:20 +01:00
Arthur Schreiber
616cd13757
Don't duplicate state that's only used when fetching.
2014-01-14 21:08:09 +01:00
Vicent Marti
76c00ead59
Merge pull request #2045 from arthurschreiber/arthur/add-git_remote_dup
...
Add `git_remote_dup`.
2014-01-14 12:03:52 -08:00
Arthur Schreiber
40ef47dd46
Add git_remote_dup.
2014-01-14 21:03:01 +01:00
Vicent Marti
557bd1f410
Merge pull request #2043 from arthurschreiber/arthur/fix-memory-leaks
...
Fix a bunch of memory leaks.
2014-01-14 10:27:57 -08:00
Vicent Marti
0d5d0ea880
Merge pull request #2004 from ethomson/pack_stream
...
Stream packs to the destination
2014-01-14 10:27:42 -08:00
Arthur Schreiber
249537573b
Incorporate @arrbee's suggestions.
2014-01-14 19:08:58 +01:00
Edward Thomson
52a8a13072
Packbuilder contains its own zstream
2014-01-14 09:45:14 -08:00
Edward Thomson
0ade2f7a59
Packbuilder stream deflate instead of one-shot
2014-01-14 09:45:13 -08:00
Edward Thomson
c6f26b48e4
Refactor zlib for easier deflate streaming
2014-01-14 09:45:12 -08:00
Ben Straub
4caf0df018
Add coverity scan badge to readme
2014-01-13 15:43:29 -08:00
Ben Straub
f1c16d0eb3
Tweak travis secure config
2014-01-13 15:18:13 -08:00
Arthur Schreiber
ac44b3d244
Incorporate @ethomson's suggestions.
2014-01-13 23:28:03 +01:00
Ben Straub
9bf17d2cf5
Add coverity-scan script
2014-01-13 14:11:14 -08:00
