]>
git.proxmox.com Git - libgit2.git/log
Michael Schubert [Tue, 16 Oct 2012 21:42:01 +0000 (23:42 +0200)]
Fix -Wunused-but-set-variable warning
Vicent Martí [Tue, 16 Oct 2012 17:54:30 +0000 (10:54 -0700)]
Merge pull request #987 from pwkelley/pthread_cond
Support pthread_cond_* on Win32
Vicent Marti [Tue, 16 Oct 2012 17:34:29 +0000 (19:34 +0200)]
test: Don't be so picky with failed lookups
Not found means not found, and the other way around.
Philip Kelley [Tue, 16 Oct 2012 17:18:45 +0000 (13:18 -0400)]
Support pthread_cond_* on Win32
Carlos Martín Nieto [Tue, 16 Oct 2012 15:58:19 +0000 (17:58 +0200)]
config: also free the XDG buffer
Vicent Martí [Tue, 16 Oct 2012 15:36:55 +0000 (08:36 -0700)]
Merge pull request #952 from csware/config-locations
Config location fixes
Philip Kelley [Tue, 16 Oct 2012 15:34:28 +0000 (08:34 -0700)]
Merge pull request #984 from arrbee/fix-fnmatch-and-ignore
Fix single file ignores
Philip Kelley [Mon, 15 Oct 2012 22:58:53 +0000 (15:58 -0700)]
Merge pull request #985 from nulltoken/fix/leaks
test: fix some memory leaks
nulltoken [Mon, 15 Oct 2012 22:49:05 +0000 (00:49 +0200)]
test: fix some memory leaks
Ben Straub [Mon, 15 Oct 2012 22:24:50 +0000 (15:24 -0700)]
Merge pull request #982 from nulltoken/clone/no-checkout
clone: Explicit support of no-checkout option
Russell Belfer [Mon, 15 Oct 2012 19:48:43 +0000 (12:48 -0700)]
Fix single-file ignore checks
To answer if a single given file should be ignored, the path to
that file has to be processed progressively checking that there
are no intermediate ignored directories in getting to the file
in question. This enables that, fixing the broken old behavior,
and adds tests to exercise various ignore situations.
Russell Belfer [Thu, 11 Oct 2012 20:39:53 +0000 (13:39 -0700)]
Import DOS fix for fnmatch
Because fnmatch uses recursion, there were some input sequences
that cause seriously degenerate behavior. This imports a fix
that imposes a max recursion limiter to avoid the worst of it.
Russell Belfer [Thu, 11 Oct 2012 18:58:00 +0000 (11:58 -0700)]
Always use internal fnmatch, not system
Ben Straub [Mon, 15 Oct 2012 19:02:20 +0000 (12:02 -0700)]
Merge pull request #978 from nulltoken/fix/reset-hard
reset: prevent hard reset in a bare repository
nulltoken [Sat, 13 Oct 2012 19:00:45 +0000 (21:00 +0200)]
test: fix some memory leaks
nulltoken [Sat, 13 Oct 2012 18:51:57 +0000 (20:51 +0200)]
reset: prevent hard reset in a bare repository
nulltoken [Mon, 15 Oct 2012 05:06:22 +0000 (07:06 +0200)]
clone: fix detection of remote HEAD
nulltoken [Mon, 15 Oct 2012 04:12:57 +0000 (06:12 +0200)]
clone: Explicit support of no-checkout option
Vicent Martí [Mon, 15 Oct 2012 17:56:47 +0000 (10:56 -0700)]
Merge pull request #969 from ben/network_category
Test category for live network tests
Ben Straub [Wed, 10 Oct 2012 22:10:07 +0000 (15:10 -0700)]
Clone: use libgit2's test repos
Ben Straub [Wed, 10 Oct 2012 17:34:26 +0000 (10:34 -0700)]
Tests: add "network" category
Split the clone tests into network and no-network suites.
Carlos Martín Nieto [Mon, 15 Oct 2012 14:35:10 +0000 (16:35 +0200)]
Fix leak in the tests
Also introduce the slective ref trimming promised but also missed in
the previous commit.
Carlos Martín Nieto [Mon, 15 Oct 2012 11:51:25 +0000 (13:51 +0200)]
refs: loosen the OID parsing
We used to require loose references to contain only an OID (possibly
after trimming the string). This is however not enough for letting us
lookup FETCH_HEAD, which can have a lot of content after the initial
OID.
Change the parsing rules so that a loose refernce must e at least 40
bytes long and the 41st (if it's there) must be accepted by
isspace(3). This makes the trim unnecessary, so only do it for
symrefs. This fixes #977.
Philip Kelley [Sun, 14 Oct 2012 16:29:05 +0000 (12:29 -0400)]
Fix buffer overrun in git_buf_put_base64
Ben Straub [Thu, 11 Oct 2012 22:45:26 +0000 (15:45 -0700)]
Merge pull request #974 from nulltoken/EEXISTS
Enforce returning of EEXISTS when trying to overwrite a reference
Vicent Martí [Thu, 11 Oct 2012 16:25:15 +0000 (09:25 -0700)]
Merge pull request #973 from AndrejMitrovic/DBinding
Add link to D libgit2 bindings.
Andrej Mitrovic [Thu, 11 Oct 2012 16:22:00 +0000 (18:22 +0200)]
Add link to D libgit2 bindings.
nulltoken [Thu, 11 Oct 2012 12:15:40 +0000 (14:15 +0200)]
tags: cover EEXISTS propagation upon creation
nulltoken [Thu, 11 Oct 2012 12:09:27 +0000 (14:09 +0200)]
branches: cover EEXISTS propagation upon moving
nulltoken [Thu, 11 Oct 2012 12:08:32 +0000 (14:08 +0200)]
branches: propagate EEXISTS upon creation
nulltoken [Thu, 11 Oct 2012 12:00:26 +0000 (14:00 +0200)]
refs: propagate EEXISTS upon renaming
Carlos Martín Nieto [Wed, 10 Oct 2012 12:57:05 +0000 (14:57 +0200)]
tests: add a test for tag autofollow behaviour
Also tell ctest and valgrind to run libgit2_clar with '-iall' so we
run the network tests in travis.
Vicent Martí [Wed, 10 Oct 2012 22:00:32 +0000 (15:00 -0700)]
Merge pull request #971 from arrbee/base64-encoder
Add git_buf_put_base64 to buffer API
Carlos Martín Nieto [Wed, 10 Oct 2012 21:55:03 +0000 (23:55 +0200)]
http: don't discard the HEAD ref
The fix for fetching from empty repositories (
22935b06d protocol:
don't store flushes; 2012-10-07) forgot to take into account the
deletion of the flush pkt in the HTTP transport. As a result, the HEAD
ref advertisement where we detect the remote's capabilities was
deleted instead. Fix this.
Russell Belfer [Wed, 10 Oct 2012 21:54:31 +0000 (14:54 -0700)]
Add git_buf_put_base64 to buffer API
Russell Belfer [Tue, 9 Oct 2012 22:25:58 +0000 (15:25 -0700)]
Fix clar issue
Russell Belfer [Tue, 9 Oct 2012 22:13:00 +0000 (15:13 -0700)]
Update to latest clar
Vicent Martí [Tue, 9 Oct 2012 20:34:40 +0000 (13:34 -0700)]
Merge pull request #803 from schu/gsoc-pack-objects
[GSoC] RFC: pack objects
Michael Schubert [Tue, 9 Oct 2012 19:49:48 +0000 (21:49 +0200)]
fixup! gsoc-pack-objects WIP
Use khash instead of git.git's hashing algorithm.
Michael Schubert [Sun, 19 Aug 2012 20:26:32 +0000 (22:26 +0200)]
gsoc-pack-objects WIP
Michael Schubert [Sun, 19 Aug 2012 20:22:07 +0000 (22:22 +0200)]
Add diff-delta code from git.git
Michael Schubert [Tue, 14 Aug 2012 21:07:54 +0000 (23:07 +0200)]
indexer: do not require absolute path
Michael Schubert [Wed, 1 Aug 2012 09:35:26 +0000 (11:35 +0200)]
Enable pthread condition vars
Michael Schubert [Tue, 10 Jul 2012 06:53:05 +0000 (08:53 +0200)]
Add git_tag_foreach
Michael Schubert [Sun, 1 Jul 2012 17:44:22 +0000 (19:44 +0200)]
git_odb_object_free: don't segfault w/ arg == NULL
Michael Schubert [Sun, 10 Jun 2012 20:04:24 +0000 (22:04 +0200)]
util: add git__compress()
Vicent Martí [Tue, 9 Oct 2012 18:45:50 +0000 (11:45 -0700)]
Merge pull request #967 from arrbee/diff-submodule-tests-and-fixes
Diff submodule tests and fixes
Michael Schubert [Mon, 8 Oct 2012 22:51:43 +0000 (00:51 +0200)]
Fix compiler warnings
* tests-clar/status: remove an unused variable
* clone: fix -Wmaybe-uninitialized warning
Ben Straub [Mon, 8 Oct 2012 22:25:44 +0000 (15:25 -0700)]
Merge pull request #949 from nulltoken/topic/deploy_repository_set_head
Deploy git_repository_set_head()
Russell Belfer [Mon, 8 Oct 2012 22:19:00 +0000 (15:19 -0700)]
Add test for diffs with submodules and bug fixes
The adds a test for the submodule diff capabilities and then
fixes a few bugs with how the output is generated. It improves
the accuracy of OIDs in the diff delta object and makes the
submodule output more closely mirror the OIDs that will be used
by core git.
Russell Belfer [Mon, 8 Oct 2012 22:18:30 +0000 (15:18 -0700)]
Extend diff helpers for tests a little
Russell Belfer [Mon, 8 Oct 2012 22:14:12 +0000 (15:14 -0700)]
Fix a few diff bugs with directory content
There are a few cases where diff should leave directories in
the diff list if we want to match core git, such as when the
directory contains a .git dir. That feature was lost when I
introduced some of the new submodule handling.
This restores that and then fixes a couple of related to diff
output that are triggered by having diffs with directories in
them.
Also, this adds a new flag that can be passed to diff if you
want diff output to actually include the file content of any
untracked files.
Russell Belfer [Mon, 8 Oct 2012 22:21:47 +0000 (15:21 -0700)]
Merge pull request #940 from scunz/diff_sm
Diff: Show submodule diff
Russell Belfer [Mon, 8 Oct 2012 21:53:37 +0000 (14:53 -0700)]
Merge pull request #966 from pwkelley/icasefix
Fix a bug where ignorecase wasn't applied to ignores
Philip Kelley [Mon, 8 Oct 2012 20:32:43 +0000 (16:32 -0400)]
Fix a bug where ignorecase wasn't applied to ignores
nulltoken [Sun, 7 Oct 2012 10:50:18 +0000 (12:50 +0200)]
clone: fix cloning of empty repository
nulltoken [Sun, 7 Oct 2012 10:04:07 +0000 (12:04 +0200)]
clone: reorganize tests
nulltoken [Wed, 26 Sep 2012 17:22:21 +0000 (19:22 +0200)]
clone: leverage refspec transform
nulltoken [Wed, 26 Sep 2012 17:15:11 +0000 (19:15 +0200)]
refspec: introduce git_refspec_transform_l()
nulltoken [Wed, 26 Sep 2012 09:05:12 +0000 (11:05 +0200)]
clone: align type casing with convention
nulltoken [Sat, 6 Oct 2012 10:20:13 +0000 (12:20 +0200)]
branch: deploy git_branch_is_head()
nulltoken [Sat, 6 Oct 2012 08:41:53 +0000 (10:41 +0200)]
branch: introduce git_branch_is_head()
nulltoken [Sat, 22 Sep 2012 10:51:34 +0000 (12:51 +0200)]
refs: deploy git_repository_set_head() usage
nulltoken [Sat, 22 Sep 2012 10:50:18 +0000 (12:50 +0200)]
clone: deploy git_repository_set_head() usage
nulltoken [Sat, 22 Sep 2012 10:47:17 +0000 (12:47 +0200)]
reset: make reset rely on git_repository_head()
nulltoken [Sat, 22 Sep 2012 10:42:16 +0000 (12:42 +0200)]
branch: enhance branch moving test coverage
nulltoken [Sun, 7 Oct 2012 19:00:46 +0000 (21:00 +0200)]
remote: use constants for well-known names
nulltoken [Fri, 21 Sep 2012 08:28:20 +0000 (10:28 +0200)]
refs: use constants for well-known names
Carlos Martín Nieto [Sun, 7 Oct 2012 09:19:19 +0000 (11:19 +0200)]
remote: only keep a weak pointer in update_tips
The reference is only needed inside the function. We mistakenly
increased the reference counter causing the ODB not to get freed and
leaking descriptors.
Carlos Martín Nieto [Sun, 7 Oct 2012 08:20:23 +0000 (10:20 +0200)]
protocol: don't store flushes
Storing flushes in the refs vector doesn't let us recognize when the
remote is empty, as we'd always introduce at least one element into
it. These flushes aren't necessary, so we can simply ignore them.
Sascha Cunz [Fri, 5 Oct 2012 11:44:18 +0000 (13:44 +0200)]
Diff: Do not try to calculate an oid for a GITLINK.
We don't have anything useful that we could do with that oid anyway (We
need to query the submodule for the HEAD commit instead).
Without this, the following code creates the error "Failed to read
descriptor: Is a directory" when run against the submod2 test-case:
const char* oidstr = "
873585b94bdeabccea991ea5e3ec1a277895b698 ";
git_tree* tree = resolve_commit_oid_to_tree(g_repo, oidstr);
git_diff_list* diff = NULL;
cl_assert(tree);
cl_git_pass(git_diff_workdir_to_tree(g_repo, NULL, tree, &diff));
Sascha Cunz [Fri, 5 Oct 2012 11:03:22 +0000 (13:03 +0200)]
Extract submodule logic out of diff_output.c:get_workdir_content
Sascha Cunz [Tue, 18 Sep 2012 21:43:23 +0000 (23:43 +0200)]
Diff: teach get_workdir_content to show a submodule as text
1. teach diff.c:maybe_modified to query git_submodule_status for the
modification state of a submodule. According to the
git_submodule_status docs, it will filter for to-ignore states
already.
2. teach diff_output.c:get_workdir_content to check the submodule status
again and create a line like:
Subproject commit <SHA-1>\n
or
Subproject comimt <SHA-1>-dirty\n
like git.git does.
Sascha Cunz [Tue, 18 Sep 2012 20:35:09 +0000 (22:35 +0200)]
Diff: teach get_blob_content to show a submodule as text
diff_output.c:get_blob_content used to try to read the submodule commit
as a blob in the superproject's odb. Of course it cannot find it and
errors out with GIT_ENOTFOUND, implcitly terminating the whole diff
output.
This patch teaches it to create a text that describes the submodule
instead. The text looks like:
Subproject commit <SHA1>\n
which is what git.git does, too.
Sascha Cunz [Fri, 5 Oct 2012 11:02:35 +0000 (13:02 +0200)]
Fix minor whitespace issue
Vicent Marti [Tue, 2 Oct 2012 18:23:54 +0000 (20:23 +0200)]
clar: Proper shutdown order
Russell Belfer [Tue, 2 Oct 2012 18:08:30 +0000 (11:08 -0700)]
Merge pull request #932 from ben/clone_pack_race
ODB: re-load packfiles on failed lookup
Russell Belfer [Tue, 2 Oct 2012 17:45:40 +0000 (10:45 -0700)]
Merge pull request #939 from pwkelley/ignorecase
Support for the core.ignorecase flag
Sven Strickroth [Tue, 2 Oct 2012 15:55:29 +0000 (17:55 +0200)]
Move win32 specific stuff to win32/findfile.c
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 2 Oct 2012 15:21:07 +0000 (17:21 +0200)]
Rename xdr to xdg
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Tue, 2 Oct 2012 15:16:22 +0000 (17:16 +0200)]
Optimized win32_nextpath
Based on a suggestion by Russell Belfer.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Russell Belfer <rb@github.com>
Vicent Martí [Mon, 1 Oct 2012 20:57:32 +0000 (13:57 -0700)]
Merge pull request #961 from arrbee/win64-cleanups
Win64 cleanups
Russell Belfer [Mon, 1 Oct 2012 19:32:55 +0000 (12:32 -0700)]
Fix up more Win64 compile warnings
Vicent Marti [Mon, 1 Oct 2012 15:59:04 +0000 (17:59 +0200)]
threads: Assert that the global state is initialized
Vicent Marti [Mon, 1 Oct 2012 15:33:05 +0000 (17:33 +0200)]
remote: Fix mid-block declaration
Vicent Martí [Mon, 1 Oct 2012 15:28:46 +0000 (08:28 -0700)]
Merge pull request #957 from carlosmn/include-tag
Include tag
Carlos Martín Nieto [Sun, 30 Sep 2012 08:56:06 +0000 (10:56 +0200)]
remote: support downloading all tags
Also honor remote.$name.tagopt = --tags.
Carlos Martín Nieto [Sat, 29 Sep 2012 20:50:33 +0000 (22:50 +0200)]
remote: use the refspec functions to parse, instead of rolling our own
The local function works for simple cases, but we shouldn't reinvent
the wheel just for us.
Carlos Martín Nieto [Thu, 27 Sep 2012 09:58:35 +0000 (11:58 +0200)]
remote: add accessors for the autotag setting
Carlos Martín Nieto [Sun, 16 Sep 2012 01:36:03 +0000 (03:36 +0200)]
remote: create tags if we have them
Together with include-tag, this make us behave more like git. After a
fetch, try to create any tags the remote told us about for which we
have objects locally.
Carlos Martín Nieto [Sat, 15 Sep 2012 06:07:24 +0000 (08:07 +0200)]
fetch: use the include-tag capability
This tells the remote to send us any tags that point to objects that
we are downloading.
Carlos Martín Nieto [Sun, 30 Sep 2012 09:37:53 +0000 (11:37 +0200)]
refs: propagate EEXISTS
Indicate whether the error comes from the ref already existing or
elsewhere. We always perform the check and this lets the user write
more concise code.
Carlos Martín Nieto [Thu, 27 Sep 2012 10:04:41 +0000 (12:04 +0200)]
refspec: add git_refspec__free, remove git_refspec_parse
The latter shouldn't be exposed and isn't used, git_refspec__parse
supersedes it.
Fix a leak in the refspec tests while we're at it.
Carlos Martín Nieto [Sun, 30 Sep 2012 09:02:53 +0000 (11:02 +0200)]
examples: fix config getter param order
Sven Strickroth [Sat, 29 Sep 2012 19:26:32 +0000 (21:26 +0200)]
Silence MinGW warnings
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 29 Sep 2012 19:26:04 +0000 (21:26 +0200)]
Added win32_ prefix for Win32-only methods
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 29 Sep 2012 19:24:07 +0000 (21:24 +0200)]
Make it compile with MinGW on Windows
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 29 Sep 2012 18:26:33 +0000 (20:26 +0200)]
Move code to find msysgit path using registry to own method
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth [Sat, 29 Sep 2012 18:20:41 +0000 (20:20 +0200)]
Find git installations based on %PATH%
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Russell Belfer [Fri, 28 Sep 2012 16:08:09 +0000 (09:08 -0700)]
Clean up Win64 warnings