]>
git.proxmox.com Git - libgit2.git/log
Edward Thomson [Mon, 20 Apr 2015 21:22:39 +0000 (17:22 -0400)]
rebase: correct documentation, CHANGELOG
Edward Thomson [Mon, 20 Apr 2015 21:19:08 +0000 (17:19 -0400)]
rebase: include checkout opts within rebase opts
Edward Thomson [Tue, 17 Mar 2015 21:21:11 +0000 (17:21 -0400)]
rebase: test checkout options for rebase
Edward Thomson [Tue, 17 Mar 2015 19:53:04 +0000 (15:53 -0400)]
rebase: init and open take a rebase_options
`git_rebase_init` and `git_rebase_open` should take a
`git_rebase_options` and use it for future rebase operations on
that `rebase` object.
Edward Thomson [Tue, 17 Mar 2015 15:47:16 +0000 (11:47 -0400)]
rebase: take `checkout_options` where appropriate
Edward Thomson [Tue, 17 Mar 2015 15:46:55 +0000 (11:46 -0400)]
reset: `git_checkout_options` is `const`
Edward Thomson [Tue, 17 Mar 2015 21:53:07 +0000 (17:53 -0400)]
rebase: block rebase_commit with unstaged changes
Edward Thomson [Tue, 17 Mar 2015 21:45:31 +0000 (17:45 -0400)]
rebase: commit should return GIT_EUNMERGED
git_rebase_commit should return `GIT_EUNMERGED` when unmerged items
exist in the index, per the documentation. Test that this is correct.
Edward Thomson [Tue, 17 Mar 2015 14:04:08 +0000 (10:04 -0400)]
rebase: identify a rebase that has not started
In `git_rebase_operation_current()`, indicate when a rebase has not
started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that
with the first operation being in-progress.
Edward Thomson [Sun, 19 Apr 2015 23:58:03 +0000 (19:58 -0400)]
Merge pull request #3024 from git-up/diff_merge_fix
Make sure to also update delta->nfiles when merging diffs
Edward Thomson [Fri, 17 Apr 2015 21:57:26 +0000 (16:57 -0500)]
Merge pull request #3016 from pks-t/ignore-exclude-fix
ignore: fix negative ignores without wildcards.
Edward Thomson [Fri, 17 Apr 2015 17:35:41 +0000 (12:35 -0500)]
Merge pull request #2999 from pks-t/submodule-set-url
Implement git_submodule_set_branch.
Edward Thomson [Fri, 17 Apr 2015 17:32:39 +0000 (12:32 -0500)]
Merge pull request #3047 from git-up/diff_fixes
Diff fixes
Edward Thomson [Fri, 17 Apr 2015 15:53:46 +0000 (10:53 -0500)]
Merge pull request #3052 from jeffhostetler/jeffhostetler/memleak_test_core_mkdir
Fix memleak in test/core/mkdir reported by CRTDBG
Jeff Hostetler [Fri, 17 Apr 2015 14:30:33 +0000 (10:30 -0400)]
Fix memleak in test/core/mkdir reported by CRTDBG
Patrick Steinhardt [Tue, 24 Mar 2015 15:33:50 +0000 (16:33 +0100)]
ignore: fix negative ignores without wildcards.
Edward Thomson [Fri, 17 Apr 2015 00:26:40 +0000 (19:26 -0500)]
Merge pull request #3042 from libgit2/cmn/odd-slowdown
revwalk: detect when we're out of interesting commits
Edward Thomson [Fri, 17 Apr 2015 00:12:28 +0000 (19:12 -0500)]
Merge pull request #3037 from libgit2/cmn/hide-then-push
Handle hide-then-push in the revwalk
Edward Thomson [Thu, 16 Apr 2015 23:26:47 +0000 (18:26 -0500)]
Merge pull request #3039 from jeffhostetler/jeffhostetler/msvc_crtdbg
Add memory leak detection/reporting using MSVC CRTDBG facility.
Pierre-Olivier Latour [Wed, 15 Apr 2015 22:28:03 +0000 (15:28 -0700)]
Fixed GIT_DIFF_UPDATE_INDEX not being aware of executable bit changes
In the prior implementation, enabling GIT_DIFF_UPDATE_INDEX would overwrite
entries in the index with the ones generated from scanning the working if the
OID was the same.
Because this OID comparison ignores file modes, this means an file in the
workdir with only an exec bit difference with the one in the index would end
up being overwritten, resulting in the exec bit being loss. There might be
other related bugs but the fix of comparing OIDs and file modes should
address them all.
Pierre-Olivier Latour [Wed, 15 Apr 2015 22:27:59 +0000 (15:27 -0700)]
Removed unnecessary condition
The variable noid is guaranteed to be zero at this point of the code path.
Pierre-Olivier Latour [Wed, 15 Apr 2015 22:27:56 +0000 (15:27 -0700)]
Use git_oid_cpy() instead of memcpy()
Jeff Hostetler [Fri, 10 Apr 2015 10:15:06 +0000 (06:15 -0400)]
Add MSVC CRTDBG memory leak reporting.
Carlos Martín Nieto [Tue, 14 Apr 2015 01:26:45 +0000 (03:26 +0200)]
revwalk: detect when we're out of interesting commits
When walking backwards and marking parents uninteresting, make sure we
detect when the list of commits we have left has run out of
uninteresting commits so we can stop marking commits as
uninteresting. Failing to do so can mean that we walk the whole history
marking everything uninteresting, which eats up time, CPU and IO for
with useless work.
While pre-marking does look for this, we still need to check during the
main traversal as there are setups for which pre-marking does not leave
enough information in the commits. This can happen if we push a commit
and hide its parent.
Carlos Martín Nieto [Mon, 13 Apr 2015 16:03:03 +0000 (18:03 +0200)]
revwalk: reword the push text
As it seems it's not quite clear what it means to push a commit, try to
be more explicit about adding a new root and that we may not see this
commit if it is hidden.
Patrick Steinhardt [Wed, 18 Mar 2015 10:45:18 +0000 (11:45 +0100)]
Implement git_submodule_set_branch.
Edward Thomson [Fri, 10 Apr 2015 09:38:07 +0000 (11:38 +0200)]
Merge pull request #2974 from libgit2/cmn/clone-everything
Make sure to pack referenced objects for non-branches
Edward Thomson [Fri, 10 Apr 2015 09:33:14 +0000 (11:33 +0200)]
Merge pull request #3030 from linquize/symlink_supported
If work_dir is not specified, use repo_dir to test if symlink is supported
Edward Thomson [Fri, 10 Apr 2015 08:50:01 +0000 (10:50 +0200)]
Merge branch 'pr/3035'
Edward Thomson [Fri, 10 Apr 2015 08:32:42 +0000 (10:32 +0200)]
Merge pull request #3038 from pks-t/fix-regcomp-retval-check
Fix checking of return value for regcomp.
Patrick Steinhardt [Fri, 10 Apr 2015 07:36:38 +0000 (09:36 +0200)]
Fix checking of return value for regcomp.
The regcomp function returns a non-zero value if compilation of
a regular expression fails. In most places we only check for
negative values, but positive values indicate an error, as well.
Fix this tree-wide, fixing a segmentation fault when calling
git_config_iterator_glob_new with an invalid regexp.
Carlos Martín Nieto [Wed, 8 Apr 2015 21:51:49 +0000 (23:51 +0200)]
revwalk: don't insert uninteresting commits into the queue
When a commit is first set as unintersting and then pushed, we must take
care that we do not put it into the commit list as that makes us return
at least that commit (but maybe more) as we've inserted it into the list
because we have the assumption that we want anything in the commit list.
Carlos Martín Nieto [Wed, 8 Apr 2015 21:42:36 +0000 (23:42 +0200)]
revwalk: add failing test for hiding and then pushing a commit
When we hide a commit which we later push into the revwalk, we do not
handle this well and return commits which we should not.
Edward Thomson [Wed, 8 Apr 2015 14:32:28 +0000 (16:32 +0200)]
Merge pull request #3033 from pks-t/describe-oid-fallback
Fix describe without refs and OID fallbacks
Jozef Matula [Wed, 8 Apr 2015 14:30:44 +0000 (16:30 +0200)]
ISO C90 forbids mixed declarations and code
GIT_UNUSED() macro generates code therefore it should be used after
variable declarations.
Patrick Steinhardt [Tue, 7 Apr 2015 12:44:08 +0000 (14:44 +0200)]
describe: only abort without tags if fallback is not allowed.
When no reference names could be found we did error out when trying to describe
a commit. This is wrong, though, when the option to fall back to a commit's
object ID is set.
Patrick Steinhardt [Tue, 7 Apr 2015 12:43:04 +0000 (14:43 +0200)]
describe example: enable building by default.
Linquize [Fri, 3 Apr 2015 16:29:01 +0000 (00:29 +0800)]
Test: Create repo in while current dir is readonly and checkout symlink
Linquize [Fri, 3 Apr 2015 11:01:20 +0000 (19:01 +0800)]
For bare repository, use repo_dir to test if symlinks are supported
Edward Thomson [Sat, 4 Apr 2015 14:17:59 +0000 (09:17 -0500)]
Merge pull request #3031 from git-up/git_index_add
Entry argument passed to git_index_add_frombuffer() should be const
Pierre-Olivier Latour [Sat, 4 Apr 2015 01:59:11 +0000 (18:59 -0700)]
Entry argument passed to git_index_add_frombuffer() should be const
Edward Thomson [Wed, 1 Apr 2015 15:13:04 +0000 (11:13 -0400)]
Merge pull request #3022 from ethomson/gitignore_vim
gitignore: ignore vim swapfiles
Pierre-Olivier Latour [Mon, 30 Mar 2015 21:06:21 +0000 (14:06 -0700)]
Make sure to also update delta->nfiles when merging diffs
When diffs are generated, the value for the 'nfiles' field of 'git_diff_delta'
will be consistent with the value in the 'status' field. Merging diffs can
modify the 'status' field of some deltas and the 'nfiles' field needs to be
updated accordingly.
Edward Thomson [Mon, 30 Mar 2015 13:33:02 +0000 (09:33 -0400)]
gitignore: ignore vim swapfiles
Edward Thomson [Wed, 25 Mar 2015 17:14:28 +0000 (13:14 -0400)]
Merge pull request #3011 from ethomson/filter_zero_tempbuf
Clear temporary buffer when filtering
Edward Thomson [Mon, 23 Mar 2015 17:12:55 +0000 (13:12 -0400)]
filter: clear the temp_buf if we're using one
If we are using a temporary buffer for filtering, be sure to clear
it before using it, in case the file that we are filtering is empty.
Jacques Germishuys [Sun, 22 Mar 2015 17:06:53 +0000 (19:06 +0200)]
Illustrate bad checkout on Windows
Carlos Martín Nieto [Wed, 25 Mar 2015 01:22:42 +0000 (02:22 +0100)]
Merge pull request #3017 from ethomson/leaks
squash some leaks
Edward Thomson [Tue, 24 Mar 2015 20:58:00 +0000 (20:58 +0000)]
squash some leaks
Edward Thomson [Tue, 24 Mar 2015 18:03:51 +0000 (14:03 -0400)]
Merge pull request #2990 from leoyanggit/custom_param
Add a custom param to git_smart_subtransport_definition
Edward Thomson [Tue, 24 Mar 2015 13:06:20 +0000 (09:06 -0400)]
Merge pull request #2986 from tkelman/mingw_winhttp
WinHTTP for MinGW
Edward Thomson [Tue, 24 Mar 2015 12:34:12 +0000 (08:34 -0400)]
Merge pull request #2947 from libgit2/cmn/notes-buf
note: use a git_buf to return the default namespace
Carlos Martín Nieto [Tue, 24 Mar 2015 09:37:12 +0000 (10:37 +0100)]
Merge pull request #2858 from pks-t/remote-squashed
examples: add remote example.
Carlos Martín Nieto [Tue, 24 Mar 2015 09:18:44 +0000 (10:18 +0100)]
Merge pull request #3010 from ethomson/checkout_invalid_path_err
checkout: report correct invalid path
Edward Thomson [Mon, 23 Mar 2015 15:30:30 +0000 (11:30 -0400)]
checkout: report correct invalid path
Carlos Martín Nieto [Sat, 21 Mar 2015 20:48:03 +0000 (21:48 +0100)]
git: make sure to close the network stream
In case of a bad url or other error during the connection setup, we
close the stream via free.
Edward Thomson [Fri, 20 Mar 2015 20:57:32 +0000 (16:57 -0400)]
Merge pull request #3003 from shawnl/master
fix changelog
Shawn Landden [Fri, 20 Mar 2015 17:18:12 +0000 (10:18 -0700)]
fix changelog
Edward Thomson [Thu, 19 Mar 2015 19:10:58 +0000 (15:10 -0400)]
Merge pull request #3000 from libgit2/vmg/mkdir-ext
mkdir-ext: Assume directories don't exist; fix all race cases
Vicent Marti [Thu, 19 Mar 2015 17:38:13 +0000 (18:38 +0100)]
mkdir-ext: Retry lstat on EEXIST race
Tony Kelman [Thu, 19 Mar 2015 14:25:25 +0000 (07:25 -0700)]
Use swprintf_s everywhere except mingw.org
Patrick Steinhardt [Mon, 26 Jan 2015 14:36:34 +0000 (15:36 +0100)]
examples: add remote example.
Carlos Martín Nieto [Thu, 19 Mar 2015 00:03:41 +0000 (01:03 +0100)]
Merge pull request #2996 from ethomson/dll_comments
win32 resource: allow custom comments field in DLL
Edward Thomson [Wed, 18 Mar 2015 22:25:14 +0000 (18:25 -0400)]
win32 resource: allow custom comments field in DLL
Edward Thomson [Wed, 18 Mar 2015 17:17:04 +0000 (13:17 -0400)]
Merge pull request #2967 from jacquesg/merge-whitespace
Allow merges of files (and trees) with whitespace problems/fixes
Leo Yang [Tue, 17 Mar 2015 16:49:33 +0000 (12:49 -0400)]
Add a custom param to git_smart_subtransport_definition
The smart transport has already take the payload param. For the
sub transport a payload param is useful for the implementer.
Carlos Martín Nieto [Wed, 18 Mar 2015 04:04:50 +0000 (05:04 +0100)]
Merge pull request #2993 from ethomson/clar_update
clar: update to
08f434d
Carlos Martín Nieto [Wed, 18 Mar 2015 04:04:12 +0000 (05:04 +0100)]
Merge pull request #2955 from git-up/update_tips_fixes
Update tips fixes
Carlos Martín Nieto [Wed, 18 Mar 2015 03:59:16 +0000 (04:59 +0100)]
Merge remote-tracking branch 'ethomson/submodule_8dot3'
Edward Thomson [Wed, 18 Mar 2015 03:35:52 +0000 (23:35 -0400)]
Merge pull request #2985 from claudiuolteanu/patch-1
Lower case the include directive of windows header
Edward Thomson [Wed, 18 Mar 2015 02:22:38 +0000 (22:22 -0400)]
Merge pull request #2983 from jeffhostetler/jeffhostetler/perf_merge_lazy_binary_check
PERF: In MERGE, lazily compute is_binary
Edward Thomson [Tue, 17 Mar 2015 23:04:48 +0000 (19:04 -0400)]
Edward Thomson [Tue, 17 Mar 2015 22:35:28 +0000 (18:35 -0400)]
Merge pull request #2991 from sba1/fix-uninitialized-data-access-remote-update-tips
Initialize refs vector in git_remote_update_tips().
Sebastian Bauer [Tue, 17 Mar 2015 20:38:58 +0000 (21:38 +0100)]
Initialize refs vector in git_remote_update_tips().
Otherwise, bailing out early when ls_to_vector() fails accesses
uninitialized memory.
Carlos Martín Nieto [Thu, 12 Mar 2015 00:52:15 +0000 (01:52 +0100)]
local: recusrively insert non-branch objects into the packfile
When we insert e.g. a tag or tagged object into the packfile, we must
make sure to insert any referenced objects as well, or we will have
broken links.
Use the recursive version of packfile insertion to make sure we send
over not just the tagged object but also the objects it references.
Carlos Martín Nieto [Thu, 12 Mar 2015 00:49:07 +0000 (01:49 +0100)]
tree: add more correct error messages for not found
Don't use the full path, as that's not what we are asserting does not
exist, but just the subpath we were looking up.
Carlos Martín Nieto [Thu, 12 Mar 2015 00:26:09 +0000 (01:26 +0100)]
packbuilder: introduce git_packbuilder_insert_recur()
This function recursively inserts the given object and any referenced
ones. It can be thought of as a more general version of the functions to
insert a commit or tree.
Carlos Martín Nieto [Thu, 12 Mar 2015 00:09:13 +0000 (01:09 +0100)]
clone: add failing test for local transport with a tag
When there is a tag, we must make sure that we get all referenced
objects from this tag as well. This failing test shows that e.g. when
there is a tagged tree, we insert the top tree but do not descend, thus
causing the clone to have broken links.
Carlos Martín Nieto [Wed, 4 Mar 2015 00:23:20 +0000 (01:23 +0100)]
note: use a git_buf to return the default namespace
The caller has otherwise no way to know how long the string will be
allocated or ability to free it.
This fixes #2944.
Tony Kelman [Tue, 17 Mar 2015 19:05:07 +0000 (12:05 -0700)]
set PKG_CONFIG_LIBDIR in toolchain-mingw32.cmake
Jacques Germishuys [Tue, 17 Mar 2015 14:34:36 +0000 (16:34 +0200)]
Added changelog entries for whitespace and patience merges.
Edward Thomson [Tue, 17 Mar 2015 14:21:28 +0000 (10:21 -0400)]
Merge pull request #2962 from libgit2/cmn/reflog-annotated
Add annotated versions of ref-modying functions
Edward Thomson [Tue, 17 Mar 2015 14:06:50 +0000 (10:06 -0400)]
Merge pull request #2972 from libgit2/cmn/pack-objects-walk
[WIP] Smarter pack-building
Edward Thomson [Tue, 17 Mar 2015 13:44:56 +0000 (09:44 -0400)]
Merge pull request #2982 from libgit2/cmn/stream-check-ec
Don't ask for a stream's certificate unless it's encrypted
Edward Thomson [Tue, 17 Mar 2015 13:44:25 +0000 (09:44 -0400)]
Merge pull request #2977 from pks-t/submodule-sync-url-fix
Fix git_submodule_sync writing URL to wrong key.
Tony Kelman [Mon, 16 Mar 2015 21:49:23 +0000 (14:49 -0700)]
use a different .def file for 64 bit
Claudiu Olteanu [Mon, 16 Mar 2015 21:08:16 +0000 (23:08 +0200)]
Lower case the include directive of windows header
Since the Linux platform has a case sensitive file system, the header name should be lower case for cross compiling purposes. (On Linux, the mingw header is called ```windows.h```).
Tony Kelman [Mon, 16 Mar 2015 20:30:10 +0000 (13:30 -0700)]
Fix out-of-tree build
link against crypt32 for CertFreeCertificateContext
Alex Crichton [Tue, 26 Aug 2014 18:18:33 +0000 (11:18 -0700)]
Fix build on mingw-w64
klutzy [Mon, 16 Mar 2015 19:46:33 +0000 (12:46 -0700)]
patch so mingw-w64 can build
Philip Kelley [Mon, 9 Jun 2014 15:43:25 +0000 (11:43 -0400)]
Win32: Enable WinHTTP for MinGW
Jeff Hostetler [Mon, 16 Mar 2015 19:54:53 +0000 (15:54 -0400)]
PERF: In MERGE, lazily compute is_binary
Carlos Martín Nieto [Mon, 16 Mar 2015 18:41:50 +0000 (19:41 +0100)]
http: do not try to use the cert callback on unencrypted streams
When the user has a certificate check callback set, we still have to
check whether the stream we're using is even capable of providing a
certificate.
In the case of an unencrypted certificate, do not ask for it from the
stream, and do not call the callback.
Carlos Martín Nieto [Mon, 16 Mar 2015 18:39:05 +0000 (19:39 +0100)]
Add failing test for cert callback with non-ecrypted stream
When we have an HTTP stream and have set the certificatre check
callback, we currently fail as we ask the unencrypted stream for its
certificate.
Carlos Martín Nieto [Sat, 7 Mar 2015 11:09:41 +0000 (12:09 +0100)]
CHANGELOG: add notes about the annotated ref-modifying functions
Carlos Martín Nieto [Fri, 6 Mar 2015 23:30:40 +0000 (00:30 +0100)]
Add tests for the annotated versions of ref-modifying functions
This also brings the soft-reset tests back to life. The function name
was missing an underscore, meaning they had not been running.
Carlos Martín Nieto [Fri, 6 Mar 2015 23:06:02 +0000 (00:06 +0100)]
annotated_commit: provide a constructor from a revspec
This extra constructor will be useful for the annotated versions of
ref-modifying functions, as it allows us to create a commit with the
extended sha syntax which was used to retrieve it.
Carlos Martín Nieto [Fri, 6 Mar 2015 22:51:40 +0000 (23:51 +0100)]
Add annotated commit versions of reflog-modifying functions
We do not always want to put the id directly into the reflog, but we
want to speicfy what a user typed. For this use-case we provide
annotated version of a few functions which let the caller specify what
user-friendly name was used when asking for the operation.
Jacques Germishuys [Thu, 12 Mar 2015 11:16:09 +0000 (13:16 +0200)]
Added options to enable patience and minimal diff drivers
Jacques Germishuys [Thu, 12 Mar 2015 10:36:09 +0000 (12:36 +0200)]
Collapse whitespace flags into git_merge_file_flags_t