proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-28 04:29:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,016 Commits 2 Branches 0 Tags 22 MiB
7838235890
Commit Graph

1311 Commits

Author SHA1 Message Date
Edward Thomson
7838235890 rebase: test checkout options for rebase 2015-04-20 16:22:59 -04:00
Edward Thomson
f3a199dd99 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.
 2015-04-20 16:22:54 -04:00
Edward Thomson
5ae38538c6 rebase: take checkout_options where appropriate 2015-04-20 16:22:49 -04:00
Edward Thomson
eaf0d68830 rebase: block rebase_commit with unstaged changes 2015-04-20 16:22:39 -04:00
Edward Thomson
49b3ddf216 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.
 2015-04-20 16:22:31 -04:00
Edward Thomson
30640aa9ad 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.
 2015-04-20 16:22:27 -04:00
Edward Thomson
4c02d39374 Merge pull request #3016 from pks-t/ignore-exclude-fix 
ignore: fix negative ignores without wildcards.
 2015-04-17 16:57:26 -05:00
Edward Thomson
a0e652d281 Merge pull request #2999 from pks-t/submodule-set-url 
Implement git_submodule_set_branch.
 2015-04-17 12:35:41 -05:00
Jeff Hostetler
e3737a4185 Fix memleak in test/core/mkdir reported by CRTDBG 2015-04-17 10:30:33 -04:00
Patrick Steinhardt
4f3586034b ignore: fix negative ignores without wildcards. 2015-04-17 09:59:16 +02:00
Edward Thomson
6f80bf4afb Merge pull request #3037 from libgit2/cmn/hide-then-push 
Handle hide-then-push in the revwalk
 2015-04-16 19:12:28 -05:00
Edward Thomson
fa7281db4e Merge pull request #3039 from jeffhostetler/jeffhostetler/msvc_crtdbg 
Add memory leak detection/reporting using MSVC CRTDBG facility.
 2015-04-16 18:26:47 -05:00
Jeff Hostetler
d06c589f48 Add MSVC CRTDBG memory leak reporting. 2015-04-15 10:25:09 -04:00
Patrick Steinhardt
129788a623 Implement git_submodule_set_branch. 2015-04-12 10:51:08 +02:00
Edward Thomson
623fbd93f1 Merge pull request #2974 from libgit2/cmn/clone-everything 
Make sure to pack referenced objects for non-branches
 2015-04-10 11:38:07 +02:00
Edward Thomson
63af449e24 Merge pull request #3030 from linquize/symlink_supported 
If work_dir is not specified, use repo_dir to test if symlink is supported
 2015-04-10 11:33:14 +02:00
Patrick Steinhardt
129022ee1e 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.
 2015-04-10 09:40:33 +02:00
Carlos Martín Nieto
5a503fffbc 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.
 2015-04-08 23:42:36 +02:00
Patrick Steinhardt
08e1fd6517 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.
 2015-04-07 17:32:56 +02:00
Linquize
7c2a2172b8 Test: Create repo in while current dir is readonly and checkout symlink 2015-04-04 23:23:19 +08:00
Edward Thomson
de355f2341 Merge pull request #3011 from ethomson/filter_zero_tempbuf 
Clear temporary buffer when filtering
 2015-03-25 13:14:28 -04:00
Jacques Germishuys
7c2b9e063b Illustrate bad checkout on Windows 2015-03-25 10:20:47 -04:00
Edward Thomson
78db0239db squash some leaks 2015-03-24 20:58:00 +00:00
Edward Thomson
95d1624b8d Merge pull request #2947 from libgit2/cmn/notes-buf 
note: use a git_buf to return the default namespace
 2015-03-24 08:34:12 -04:00
Edward Thomson
89ba9f1acc Merge pull request #2967 from jacquesg/merge-whitespace 
Allow merges of files (and trees) with whitespace problems/fixes
 2015-03-18 13:17:04 -04:00
Carlos Martín Nieto
7568bdf4ab Merge pull request #2993 from ethomson/clar_update 
clar: update to 08f434d
 2015-03-18 05:04:50 +01:00
Carlos Martín Nieto
83ad46f726 Merge remote-tracking branch 'ethomson/submodule_8dot3' 2015-03-18 04:59:16 +01:00
Edward Thomson
4c2e6b1e87 Merge pull request #2985 from claudiuolteanu/patch-1 
Lower case the include directive of windows header
 2015-03-17 23:35:52 -04:00
Edward Thomson
08c29c4451 clar: update to 08f434d 2015-03-17 19:04:48 -04:00
Carlos Martín Nieto
d23fb5c943 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.
 2015-03-17 20:50:39 +01:00
Carlos Martín Nieto
385449b1df 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.
 2015-03-17 20:50:02 +01:00
Edward Thomson
9bbc8f350b Merge pull request #2962 from libgit2/cmn/reflog-annotated 
Add annotated versions of ref-modying functions
 2015-03-17 10:21:28 -04:00
Edward Thomson
828e595969 Merge pull request #2982 from libgit2/cmn/stream-check-ec 
Don't ask for a stream's certificate unless it's encrypted
 2015-03-17 09:44:56 -04:00
Edward Thomson
c07d02064d Merge pull request #2977 from pks-t/submodule-sync-url-fix 
Fix git_submodule_sync writing URL to wrong key.
 2015-03-17 09:44:25 -04:00
Claudiu Olteanu
118e6fdc8f 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```).
 2015-03-16 23:08:16 +02:00
Carlos Martín Nieto
29e7ae5d81 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.
 2015-03-16 19:39:05 +01:00
Carlos Martín Nieto
a5815a2afb 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.
 2015-03-16 16:57:30 +01:00
Jacques Germishuys
13de936316 Collapse whitespace flags into git_merge_file_flags_t 2015-03-16 09:53:27 +02:00
Jacques Germishuys
f29dde6828 Renamed git_merge_options 'flags' to 'tree_flags' 2015-03-16 09:53:27 +02:00
Jacques Germishuys
0f24cac2b9 Added tests to merge files and branches with whitespace problems and fixes 2015-03-16 09:53:27 +02:00
Carlos Martín Nieto
e5e2c11d5d Put back the number of expected references to 6 from the test repo 
This was but down to 5 when GitHub made a change to their server which
made them stop honouring the include-tag request.

This has recently been corrected, so we can bring it back up to six.
 2015-03-13 17:52:07 +01:00
Patrick Steinhardt
e6903ea278 Fix git_submodule_sync writing URL to wrong key. 
Currently git_submodule_sync writes the submodule's URL to the
key 'branch.<REMOTE_NAME>.remote' while the reference
implementation of `git submodule sync` writes to
'remote.<REMOTE_NAME>.url', which is the intended behavior
according to git-submodule(1).
 2015-03-12 16:05:07 +01:00
Carlos Martín Nieto
15f581747c Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2 2015-03-11 17:55:39 +01:00
Carlos Martín Nieto
522df1cf1d Merge pull request #2970 from ethomson/inmemory_bare 
"In-memory" repos are bare by default
 2015-03-11 03:03:54 +01:00
Edward Thomson
70c735e190 repository_new: test its bareness 2015-03-10 16:49:24 -04:00
Pierre-Olivier Latour
b5ab878f4c Fixed build warning 2015-03-08 14:09:50 -07:00
Carlos Martín Nieto
d578b45f3f refdb: use the same id for old and new when renaming a reference 
When we rename a reference, we want the old and new ids to be the same
one (as we did not change it). The normal code path looks up the old id
from the current value of the brtanch, but by the time we look it up, it
does not exist anymore and thus we write a zero id.

Pass the old id explicitly instead.
 2015-03-08 16:50:27 +01:00
Edward Thomson
01c3b184d3 Merge pull request #2961 from ethomson/filter_relative_paths 
Filter relative paths
 2015-03-06 16:52:07 -05:00
Edward Thomson
0b3dd8fbed filter::file tests: test filter_list_apply_to_file 
Test that filter_list_apply_to_file works and can accept repo-relative
paths.
 2015-03-06 15:16:05 -05:00
nulltoken
7eb7673406 branch: fix generated reflog message upon renaming 2015-03-04 22:09:49 +01:00