]>
git.proxmox.com Git - libgit2.git/log
Edward Thomson [Tue, 3 Feb 2015 05:35:24 +0000 (05:35 +0000)]
remove some unused warnings
Edward Thomson [Tue, 3 Feb 2015 06:46:01 +0000 (01:46 -0500)]
checkout: hold seen dir paths in a map
Edward Thomson [Tue, 3 Feb 2015 05:28:32 +0000 (00:28 -0500)]
attr_session: keep a temp buffer
Edward Thomson [Tue, 3 Feb 2015 05:03:49 +0000 (00:03 -0500)]
checkout: cache system attributes file location
Edward Thomson [Thu, 29 Jan 2015 20:40:55 +0000 (14:40 -0600)]
attrcache: don't re-read attrs during checkout
During checkout, assume that the .gitattributes files aren't
modified during the checkout. Instead, create an "attribute session"
during checkout. Assume that attribute data read in the same
checkout "session" hasn't been modified since the checkout started.
(But allow subsequent checkouts to invalidate the cache.)
Further, cache nonexistent git_attr_file data even when .gitattributes
files are not found to prevent re-scanning for nonexistent files.
Edward Thomson [Tue, 3 Feb 2015 03:36:07 +0000 (03:36 +0000)]
tests: update for new test data
Edward Thomson [Tue, 3 Feb 2015 03:18:38 +0000 (22:18 -0500)]
checkout test: ensure .gitattributes lifecycle
The .gitattributes cache should not reload .gitattributes in the
middle of checking out, only between checkout operations. Otherwise,
we'll spend all our time stat'ing and read'ing the gitattributes.
Edward Thomson [Mon, 26 Jan 2015 17:28:59 +0000 (11:28 -0600)]
Merge pull request #2819 from libgit2/cmn/config-get-path
config: add parsing and getter for paths
Edward Thomson [Mon, 26 Jan 2015 17:27:09 +0000 (11:27 -0600)]
Merge pull request #2837 from swisspol/set_index
Allow passing a NULL index to git_repository_set_index()
Edward Thomson [Mon, 26 Jan 2015 17:25:16 +0000 (11:25 -0600)]
Merge pull request #2839 from swisspol/typo
Fixed typo in git_repository_reinit_filesystem() documentation
Edward Thomson [Mon, 26 Jan 2015 17:24:47 +0000 (11:24 -0600)]
Merge pull request #2847 from jacquesg/coverity
More coverity fixes
Edward Thomson [Mon, 26 Jan 2015 17:21:04 +0000 (11:21 -0600)]
Merge pull request #2840 from swisspol/sys_repository_include
Make sure sys/repository.h includes the required headers
Edward Thomson [Mon, 26 Jan 2015 17:20:00 +0000 (11:20 -0600)]
Merge pull request #2841 from swisspol/set_bare
Fixed git_repository_set_bare() not setting "core.bare" correctly
Edward Thomson [Mon, 26 Jan 2015 17:18:17 +0000 (11:18 -0600)]
Merge pull request #2844 from rakuco/netinet-include-fixes
openssl: Add all required includes for AF_INET6 and in6_addr.
Edward Thomson [Mon, 26 Jan 2015 16:56:40 +0000 (10:56 -0600)]
Merge pull request #2848 from JIghtuse/describe_mem_fix
describe example: fix memory allocation size
Carlos Martín Nieto [Mon, 26 Jan 2015 16:29:15 +0000 (17:29 +0100)]
Merge pull request #2846 from JIghtuse/master
pathspec: do not try to dereference NULL
Boris Egorov [Sun, 25 Jan 2015 16:34:46 +0000 (22:34 +0600)]
describe example: fix memory allocation size
We need to allocate memory for sizeof(char *) * ncommits, not just for
ncommits.
Issue detected by GCC's AddressSanitizer.
Jacques Germishuys [Sun, 25 Jan 2015 12:40:23 +0000 (14:40 +0200)]
Ensure the diff hunk callback is specified before trying to dereference it
Jacques Germishuys [Sun, 25 Jan 2015 12:38:10 +0000 (14:38 +0200)]
Return early if allocating a git_pathspec_match_list failed
Jacques Germishuys [Sun, 25 Jan 2015 12:08:05 +0000 (14:08 +0200)]
Ensure git_index_entry is not NULL before trying to free it
Boris Egorov [Sat, 24 Jan 2015 18:07:23 +0000 (00:07 +0600)]
pathspec: do not try to dereference NULL
pathspec_match_free() should not dereference a NULL passed to it.
I found this issue when I tried to run example log program with
nonexistent branch:
./example/log help
Such call leads to segmentation fault.
Raphael Kubo da Costa [Sat, 24 Jan 2015 14:19:43 +0000 (16:19 +0200)]
openssl: Add all required includes for AF_INET6 and in6_addr.
This fixes the build at least on FreeBSD, where those types were not
defined indirectly:
src/openssl_stream.c:100:18: error: variable has incomplete type 'struct in6_addr'
struct in6_addr addr6;
^
src/openssl_stream.c:100:9: note: forward declaration of 'struct in6_addr'
struct in6_addr addr6;
^
src/openssl_stream.c:111:18: error: use of undeclared identifier 'AF_INET'
if (p_inet_pton(AF_INET, host, &addr4)) {
^
src/unix/posix.h:31:40: note: expanded from macro 'p_inet_pton'
^
src/openssl_stream.c:115:18: error: use of undeclared identifier 'AF_INET6'
if(p_inet_pton(AF_INET6, host, &addr6)) {
^
src/unix/posix.h:31:40: note: expanded from macro 'p_inet_pton'
^
Pierre-Olivier Latour [Sat, 24 Jan 2015 04:57:13 +0000 (20:57 -0800)]
Fixed git_repository_set_bare() not setting "core.bare" correctly
Pierre-Olivier Latour [Sat, 24 Jan 2015 00:04:23 +0000 (16:04 -0800)]
Make sure sys/repository.h includes the required headers
It was missing "common.h" and "types.h" like other system headers.
This generated compilation errors if including it directly.
Pierre-Olivier Latour [Fri, 23 Jan 2015 23:59:54 +0000 (15:59 -0800)]
Fixed typo in git_repository_reinit_filesystem() documentation
Pierre-Olivier Latour [Fri, 23 Jan 2015 23:35:29 +0000 (15:35 -0800)]
Allow passing a NULL index to git_repository_set_index()
This is supported by the underlying set_index() implementation
and setting the repository index to NULL is recommended by the
git_repository_set_bare() documentation.
Edward Thomson [Fri, 23 Jan 2015 01:00:16 +0000 (19:00 -0600)]
Merge pull request #2834 from ethomson/memleak
checkout: free last created directory
Edward Thomson [Fri, 23 Jan 2015 00:18:42 +0000 (00:18 +0000)]
checkout: free last created directory
Edward Thomson [Wed, 21 Jan 2015 15:20:54 +0000 (09:20 -0600)]
Merge pull request #2829 from jacquesg/dead-code
Remove logically dead code (we're already asserting)
Edward Thomson [Tue, 20 Jan 2015 23:48:34 +0000 (17:48 -0600)]
Merge pull request #2823 from ethomson/appveyor_badge
README: Point to libgit2 account's AppVeyor badge
Edward Thomson [Thu, 15 Jan 2015 23:17:01 +0000 (17:17 -0600)]
checkout tests: cleanup realpath impl on Win32
Edward Thomson [Thu, 15 Jan 2015 02:16:01 +0000 (20:16 -0600)]
checkout tests: emulate p_realpath poorly on Win32
Edward Thomson [Wed, 14 Jan 2015 23:47:00 +0000 (18:47 -0500)]
checkout: remove files before writing new ones
On case insensitive filesystems, we may have files in the working
directory that case fold to a name we want to write. Remove those
files (by default) so that we will not end up with a filename that
has the unexpected case.
Edward Thomson [Wed, 14 Jan 2015 18:20:21 +0000 (13:20 -0500)]
checkout: drop newline in error message
Edward Thomson [Wed, 14 Jan 2015 18:15:34 +0000 (13:15 -0500)]
checkout tests: nasty symlinks
Symbolic links that abuse case insensitivity to write into .git.
Edward Thomson [Tue, 13 Jan 2015 19:02:58 +0000 (13:02 -0600)]
checkout: don't recreate previous directory
Don't bother trying to recreate the previously created directory
during checkout, for a modest reduction in the number of stats.
Edward Thomson [Tue, 13 Jan 2015 17:18:02 +0000 (11:18 -0600)]
mkdir: walk up tree to mkdir
Walk up the tree to mkdir, which is less immediately efficient,
but allows us to look at intermediate directories that may need
attention.
Edward Thomson [Mon, 12 Jan 2015 21:48:53 +0000 (15:48 -0600)]
git_path_join_unrooted: return base len
The documentation for `git_path_join_unrooted` states that the base
length will be returned, so that consumers like checkout know where
to start creating directories instead of always creating directories
at the directory root.
Edward Thomson [Mon, 12 Jan 2015 22:16:27 +0000 (16:16 -0600)]
checkout: introduce git_checkout_perfdata
Checkout can now provide performance data about the number of (some)
syscalls performed using an optional callback.
Edward Thomson [Tue, 20 Jan 2015 22:19:55 +0000 (16:19 -0600)]
Merge pull request #2704
Linquize [Sun, 26 Oct 2014 04:45:23 +0000 (05:45 +0100)]
Add files and tests with many UTF-8 chars and few UTF-8 chars
Sven Strickroth [Thu, 13 Nov 2014 18:30:47 +0000 (19:30 +0100)]
Make binary detection work similar to vanilla git
Main change: Don't treat chars > 128 as non-printable (common in UTF-8 files)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Jacques Germishuys [Tue, 20 Jan 2015 21:26:55 +0000 (23:26 +0200)]
Treat a NULL string as if it's empty
Jacques Germishuys [Tue, 20 Jan 2015 21:24:32 +0000 (23:24 +0200)]
Remove logically dead code (we're already asserting)
Carlos Martín Nieto [Tue, 20 Jan 2015 19:13:34 +0000 (20:13 +0100)]
Merge pull request #2828 from ethomson/treediff_dont_patch
diff: only compute patches when requested
Edward Thomson [Tue, 20 Jan 2015 18:31:24 +0000 (12:31 -0600)]
diff: only compute patches when requested
When we're called with no hunk or line callback, we don't need to
do the hunk or line computation.
Edward Thomson [Thu, 15 Jan 2015 22:56:58 +0000 (16:56 -0600)]
README: Point to libgit2 account's AppVeyor badge
Microsoft is sponsoring a Pro account at AppVeyor for the libgit2
and LibGit2Sharp projects. Point to that account's badge.
Carlos Martín Nieto [Thu, 15 Jan 2015 13:57:37 +0000 (14:57 +0100)]
Merge pull request #2821 from maksqwe/strlen_optimization
Remove strlen() calls from loop condition
Maks Naumov [Thu, 15 Jan 2015 13:16:19 +0000 (15:16 +0200)]
Remove strlen() calls from loop condition
Avoid str length recalculation every iteration
Carlos Martín Nieto [Wed, 14 Jan 2015 14:05:43 +0000 (15:05 +0100)]
config: add parsing and getter for paths
Edward Thomson [Wed, 14 Jan 2015 16:26:26 +0000 (10:26 -0600)]
CHANGELOG: include small file similarity detection
Edward Thomson [Wed, 14 Jan 2015 16:23:38 +0000 (10:23 -0600)]
Merge pull request #2818 from leoyanggit/openssl_option
Add option to turn off OpenSSL
Edward Thomson [Wed, 14 Jan 2015 16:19:28 +0000 (10:19 -0600)]
Merge branch 'pr/2740'
Pierre-Olivier Latour [Tue, 2 Dec 2014 13:47:32 +0000 (05:47 -0800)]
Always use GIT_HASHSIG_SMART_WHITESPACE when diffing for merges
git_merge_tree_flag_t cannot contain any GIT_DIFF_FIND_xxx flags so there's not point in checking for them
Pierre-Olivier Latour [Tue, 2 Dec 2014 13:11:12 +0000 (05:11 -0800)]
Added GIT_HASHSIG_ALLOW_SMALL_FILES to allow computing signatures for small files
The implementation of the hashsig API disallows computing a signature on
small files containing only a few lines. This new flag disables this
behavior.
git_diff_find_similar() sets this flag by default which means that rename
/ copy detection of small files will now work. This in turn affects the
behavior of the git_status and git_blame APIs which will now detect rename
of small files assuming the right options are passed.
Leo Yang [Tue, 13 Jan 2015 21:53:07 +0000 (16:53 -0500)]
Add option to turn off OpenSSL
nulltoken [Tue, 13 Jan 2015 19:35:08 +0000 (20:35 +0100)]
Merge pull request #2817 from PeterDaveHello/patch-1
Use svg instead of png to get better image quality
Carlos Martín Nieto [Tue, 13 Jan 2015 18:29:00 +0000 (19:29 +0100)]
Pre-fill the changelog with the subheadings
Peter Dave Hello [Tue, 13 Jan 2015 18:14:38 +0000 (02:14 +0800)]
Use svg instead of png to get better image quality
Carlos Martín Nieto [Mon, 12 Jan 2015 07:59:46 +0000 (08:59 +0100)]
Merge pull request #2815 from ethomson/example
clone example: don't divide by zero
Edward Thomson [Sat, 10 Jan 2015 18:05:01 +0000 (18:05 +0000)]
clone example: don't divide by zero
Local transports don't have data about the size, avoid dividing by
zero in the callback.
Carlos Martín Nieto [Fri, 9 Jan 2015 23:49:20 +0000 (00:49 +0100)]
Reformat the changelog
This should provide a easier way to see what kinds of changes we have,
and a single place to look at the breaking changes.
Carlos Martín Nieto [Fri, 9 Jan 2015 15:47:48 +0000 (16:47 +0100)]
Merge commit '
4b1018d24f980273528743c27c47ceb96cb720bd '
Fix crash in free() when git_buf_grow() fails.
Jeff Hostetler [Thu, 8 Jan 2015 22:24:12 +0000 (17:24 -0500)]
Fix crash in free() when git_buf_grow() fails.
Carlos Martín Nieto [Fri, 9 Jan 2015 15:29:08 +0000 (16:29 +0100)]
Fix warning
Carlos Martín Nieto [Fri, 9 Jan 2015 09:23:08 +0000 (10:23 +0100)]
Merge pull request #2810 from ethomson/remove_symlinks
Remove symlinks from the repository
Edward Thomson [Thu, 8 Jan 2015 23:27:58 +0000 (17:27 -0600)]
Merge pull request #2811 from ethomson/remote_leak
remote: plug leak
Edward Thomson [Thu, 8 Jan 2015 21:32:44 +0000 (21:32 +0000)]
submodule::init tests: free some leaks
Edward Thomson [Thu, 8 Jan 2015 19:45:22 +0000 (13:45 -0600)]
remote: plug leak
Edward Thomson [Thu, 8 Jan 2015 19:23:37 +0000 (19:23 +0000)]
repo::init test: create hook symlink
Remove the hook symlink from the test resources, so that we can
have a source tree that is easy to zip up and copy around on systems
that don't support symlinks. Create it dynamically at test execution
instead.
Edward Thomson [Thu, 8 Jan 2015 17:20:44 +0000 (11:20 -0600)]
Merge pull request #2802 from calavera/remote_create_prune_config
Load prune configuration when a remote is created.
David Calavera [Wed, 7 Jan 2015 17:26:36 +0000 (09:26 -0800)]
Fix more indentation.
David Calavera [Tue, 6 Jan 2015 21:49:39 +0000 (13:49 -0800)]
Add extern function to initialize submodule update options.
Carlos Martín Nieto [Wed, 7 Jan 2015 11:54:08 +0000 (11:54 +0000)]
Merge pull request #2806 from ethomson/changelog
CHANGELOG: we've added git_describe
Edward Thomson [Wed, 7 Jan 2015 00:34:55 +0000 (18:34 -0600)]
Merge pull request #2805 from ethomson/msvc
submodule: declare vars at top of func block
Edward Thomson [Wed, 7 Jan 2015 00:34:43 +0000 (18:34 -0600)]
Merge pull request #2803 from ethomson/appveyor
Add appveyor yaml
Edward Thomson [Tue, 6 Jan 2015 23:18:57 +0000 (17:18 -0600)]
CHANGELOG: we've added git_describe
Edward Thomson [Tue, 6 Jan 2015 21:16:25 +0000 (15:16 -0600)]
Add appveyor yaml
Edward Thomson [Tue, 6 Jan 2015 23:08:38 +0000 (17:08 -0600)]
submodule: declare vars at top of func block
Carlos Martín Nieto [Mon, 5 Jan 2015 21:34:26 +0000 (21:34 +0000)]
Merge pull request #2801 from ethomson/changelog
CHANGELOG: add missing 0.22 changes
David Calavera [Mon, 5 Jan 2015 21:33:36 +0000 (13:33 -0800)]
Fix intentation.
Edward Thomson [Mon, 5 Jan 2015 21:10:38 +0000 (15:10 -0600)]
CHANGELOG: add missing 0.22 changes
Carlos Martín Nieto [Mon, 5 Jan 2015 21:28:30 +0000 (21:28 +0000)]
Merge pull request #2799 from ethomson/merge_doc
Better document `git_merge_commits`
David Calavera [Mon, 5 Jan 2015 21:24:11 +0000 (13:24 -0800)]
Load prune configuration when a remote is created.
Carlos Martín Nieto [Mon, 5 Jan 2015 20:20:08 +0000 (20:20 +0000)]
Fix the version in CHANGELOG to 0.22
The release after 0.21 is 0.22. Add a new heading for the changes since
0.22.
Carlos Martín Nieto [Mon, 5 Jan 2015 20:16:48 +0000 (20:16 +0000)]
Bump version to 0.22
Bump the version number to 0.22.0 and the SOVERSION to 22.
Carlos Martín Nieto [Mon, 5 Jan 2015 20:10:43 +0000 (20:10 +0000)]
Merge commit 'refs/pull/2632/head' of github.com:libgit2/libgit2
Edward Thomson [Mon, 5 Jan 2015 17:34:17 +0000 (11:34 -0600)]
Better document `git_merge_commits`
`git_merge_commits` (and thus `git_merge`) do not use the same
strategy as `git-merge-recursive` wherein they can produce an
artificial common ancestor that is the merge of all common
ancestors. Document this accordingly.
Carlos Martín Nieto [Sun, 4 Jan 2015 17:39:43 +0000 (17:39 +0000)]
Plug a couple of leaks
Carlos Martín Nieto [Sun, 4 Jan 2015 16:44:33 +0000 (16:44 +0000)]
Merge pull request #2792 from swisspol/fix_remote_download
Fixed internal push state not being cleared when calling git_remote_download()
Carlos Martín Nieto [Sun, 4 Jan 2015 12:33:18 +0000 (12:33 +0000)]
Merge pull request #2794 from calavera/include_right_common
Include git2/common.h in sys/openssl.h.
David Calavera [Fri, 2 Jan 2015 23:56:03 +0000 (15:56 -0800)]
Include git2/common.h in sys/openssl.h.
Pierre-Olivier Latour [Thu, 1 Jan 2015 12:14:58 +0000 (04:14 -0800)]
Fixed internal push state not being cleared on download
git_remote_download() must also clear the internal push state resulting from a possible earlier push operation. Otherwise calling git_remote_update_tips() will execute the push version instead of the fetch version and among other things, tags won't be updated.
Edward Thomson [Wed, 31 Dec 2014 15:27:44 +0000 (09:27 -0600)]
Merge pull request #2788 from swisspol/fix_docs
Fixed git_revert() documentation
Pierre-Olivier Latour [Tue, 30 Dec 2014 23:54:30 +0000 (15:54 -0800)]
Fixed git_revert() documentation
Edward Thomson [Tue, 30 Dec 2014 17:53:55 +0000 (11:53 -0600)]
Merge pull request #2761 from libgit2/cmn/fetch-prune
Remote-tracking branch prunning
Edward Thomson [Tue, 30 Dec 2014 17:53:45 +0000 (11:53 -0600)]
Merge pull request #2762 from libgit2/cmn/hide-push
remote: remove git_push from the public API
Carlos Martín Nieto [Tue, 30 Dec 2014 17:06:04 +0000 (17:06 +0000)]
Update CHANGELOG for pruning
Carlos Martín Nieto [Tue, 16 Dec 2014 07:57:05 +0000 (08:57 +0100)]
remote: remove git_push from the public API
Instead we provide git_remote_upload() and git_remote_update_tips() in
order to have a parallel API for fetching and pushing.
Carlos Martín Nieto [Tue, 30 Dec 2014 16:48:52 +0000 (16:48 +0000)]
Merge pull request #2785 from jacquesg/coverity
Coverity fixes