proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 20:06:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,844 Commits 2 Branches 0 Tags 22 MiB
fb5917679d
Commit Graph

6844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Kelley
fb5917679d Win32: Fix object::cache::threadmania test on x64 2014-06-07 12:51:48 -04:00
Philip Kelley
df192198d3 Merge pull request #2408 from phkelley/win32_test_fixes 
Win32 test fixes
 2014-06-07 12:37:49 -04:00
Philip Kelley
daf2a648b1 Win32: Fix diff::workdir::submodules test #2361 2014-06-07 12:18:56 -04:00
Philip Kelley
6d1b04383e Win32: Fix failing clone_mirror test 2014-06-07 12:18:24 -04:00
Vicent Marti
716e20b47e Merge pull request #2404 from libgit2/cmn/remote-rename-fixes 
Remote rename fixes
 2014-06-06 13:37:22 +02:00
Vicent Marti
c073184e62 Merge pull request #2405 from arthurschreiber/patch-4 
Update AUTHORS
 2014-06-06 13:35:29 +02:00
Arthur Schreiber
05554d839d Update AUTHORS 
Add me. :)
 2014-06-06 11:01:20 +02:00
Carlos Martín Nieto
a52ab4b82a remote: tighten up reference renaming 
Tighten up which references we consider for renaming so we don't try to
rename unrelated ones and end up with unexplained references.

If there is a reference on the target namespace, git overwrites it, so
let's do the same.
 2014-06-06 01:09:49 +02:00
Carlos Martín Nieto
fe3b9d0731 remote: failing test for rename 
When there is a reference in the target namespace, we should overwrite
it. Instead it gets a different name under the current code.
 2014-06-06 00:54:11 +02:00
Vicent Marti
90befde4a1 Merge pull request #2399 from libgit2/cmn/path-to-path 
clone: re-use the local transport's path resolution
 2014-06-03 22:10:34 +02:00
Russell Belfer
dfcba09e67 Merge pull request #2395 from libgit2/cmn/ref-iter-concurrent 
Concurrent ref iterator access
 2014-06-03 13:05:20 -07:00
Carlos Martín Nieto
18d7896cb0 clone: re-use the local transport's path resolution 
Whe already worked out the kinks with the function used in the local
transport. Expose it and make use of it in the local clone method
instead of trying to work it out again.
 2014-06-03 21:47:53 +02:00
Vicent Marti
bccb36ebf9 Merge pull request #2389 from arthurschreiber/arthur/set-error-when-no-remote-found 
Remote: Set an error when a remote cannot be found.
 2014-06-03 17:25:59 +02:00
Vicent Marti
eb27d29676 Merge pull request #2396 from libgit2/cmn/docstuff 
Documentation formatting fixes
 2014-06-03 17:23:43 +02:00
Carlos Martín Nieto
69a1a6918c Plug a leak in the tests 2014-06-03 16:18:08 +02:00
Carlos Martín Nieto
dedfc7346b index: split GIT_IDXENTRY into two flag enums 
The documentation has shown this as a single enum for a long time. These
should in fact be two enums. One with the bits for the flags and another
with the bits for the extended flags.
 2014-06-03 16:05:36 +02:00
Carlos Martín Nieto
11e2665e50 Formatting fixes for the docs 
These are some issues I found while playing around with the new parser
for docurium.
 2014-06-03 16:05:35 +02:00
Carlos Martín Nieto
2d945f82f6 refs: copy the packed refs on iteration 
This lets us work without worrying about what's happening but work on a
snapshot.
 2014-06-02 17:50:30 +02:00
Carlos Martín Nieto
4ee2543c5a refs: failing test for concurrent ref access 
If we remove a reference while we're iterating through the packed refs,
the position in the iterator will be off.
 2014-06-02 16:46:47 +02:00
Vicent Marti
2f6f6ebc99 Merge pull request #2392 from libgit2/cmn/remote-delete 
remote: build up the list of refs to remove
 2014-06-01 16:26:44 +02:00
Carlos Martín Nieto
8a9419aae1 remote: build up the list of refs to remove 
When removing the remote-tracking branches, build up the list and remove
in two steps, working around an issue with the iterator. Removing while
we're iterating over the refs can cause us to miss references.
 2014-06-01 02:16:07 +02:00
Vicent Marti
9bc2813bef Merge pull request #2391 from libgit2/rb/clean-up-diff-binary-print 
Minor fixes to binary diff code
 2014-05-31 19:59:41 +02:00
Russell Belfer
bc81220dfc minor cleanups 2014-05-31 10:19:55 -07:00
Russell Belfer
947a58c175 Clean up the handling of large binary diffs 2014-05-31 10:14:14 -07:00
Arthur Schreiber
d723dbed0c Remote: Set an error when a remote cannot be found. 
Inside `git_remote_load`, the calls to `get_optional_config` use
`giterr_clear` to unset any errors that are set due to missing config
keys. If neither a fetch nor a push url config was found for a remote,
we should set an error again.
 2014-05-30 19:26:49 +02:00
Vicent Marti
4cf826850a Merge pull request #2388 from ethomson/safecrlf_ignore_warn 
Ignore core.safecrlf=warn until we have a warn infrastructure
 2014-05-30 19:07:59 +02:00
Edward Thomson
49837fd49f Ignore core.safecrlf=warn until we have a warn infrastructure 2014-05-30 11:30:53 -05:00
Vicent Marti
58eea5ebf4 Merge pull request #2358 from arthurschreiber/arthur/normalize-ref-names-on-creation 
Respect core.precomposeunicode = true in more cases.
 2014-05-30 15:28:05 +02:00
Arthur Schreiber
9d6c3d2853 Refs: Extend unicode test for branch creation. 
This adds another assertion to ensure that the reference name inside
the git_reference struct returned by `git_branch_create` is returned as
precomposed if `core.precomposeunicode` is enabled.
 2014-05-30 15:15:54 +02:00
Arthur Schreiber
1a90b1e3f1 Refs: Add a unicode test for git_branch_move. 
This tests that decomposed branch names are correctly precomposed when
passed to `git_branch_move` and `core.precomposeunicode` is enabled.
 2014-05-30 14:53:28 +02:00
Arthur Schreiber
824f755f10 Refs: Introduce git_refname_t. 2014-05-30 14:30:30 +02:00
Arthur Schreiber
68f9d6b283 Refs: Fix some issue when core.precomposeunicode = true. 
This fixes two issues I found when core.precomposeunicode is enabled:

* When creating a reference with a NFD string, the returned
  git_reference would return this NFD string as the reference’s
  name. But when looking up the reference later, the name would
  then be returned as NFC string.
* Renaming a reference would not honor the core.precomposeunicode and
  apply no normalization to the new reference name.
 2014-05-30 14:30:30 +02:00
Carlos Martín Nieto
5f0527aeac config: initialize the error 
The error would be uninitialized if we take a snapshot of a config with
no backends.
 2014-05-30 13:06:34 +02:00
Vicent Marti
19d77ce109 Merge pull request #2381 from ecoffey/example_log_author_filter 
Add support for --author flag in example log implementation
 2014-05-29 14:51:25 +02:00
Vicent Marti
31c551528b Merge pull request #2011 from libgit2/cmn/clone-local 
Local clone
 2014-05-29 14:50:57 +02:00
Carlos Martín Nieto
bc9f67fa85 clone: more explicit local tests 
Assert the exact amount of links we expect. While there, check that a
plain git_clone() automatically chooses to link.
 2014-05-29 10:06:48 +02:00
Russell Belfer
065a00e2c9 Merge pull request #2386 from Therzok/patch-2 
[Blob] Update documentation for is_binary.
 2014-05-28 14:51:22 -07:00
Ungureanu Marius
fda73bc5fd [Blob] Update documentation for is_binary. 
filter.h tells me that we check the first 8000 bytes.
 2014-05-28 22:57:21 +03:00
Eoin Coffey
33bf1b1ab0 examples/log.c: invert filtering impl and conditional 2014-05-28 09:40:08 -06:00
Carlos Martín Nieto
2614819cf3 clone: allow for linking in local clone 
If requested, git_clone_local_into() will try to link the object files
instead of copying them.

This only works on non-Windows (since it doesn't have this) when both
are on the same filesystem (which are unix semantics).
 2014-05-28 15:40:47 +02:00
Carlos Martín Nieto
94f742bac6 fileops: allow linking files when copying directory structures 
When passed the LINK_FILES flag, the recursive copy will hardlink files
instead of copying them.
 2014-05-28 15:40:22 +02:00
Carlos Martín Nieto
c1dbfcbb4a clone: add flag not to link 2014-05-28 15:40:22 +02:00
Carlos Martín Nieto
121b26738e clone: add flags to override whether to perform a local clone 2014-05-28 15:40:22 +02:00
Carlos Martín Nieto
a0b5f7854c clone: store the realpath when given a relative one 
A call like git_clone("./foo", "./foo1") writes origin's url as './foo',
which makes it unusable, as they're relative to different things.

Go with git's behaviour and store the realpath as the url.
 2014-05-28 15:40:22 +02:00
Carlos Martín Nieto
4386d80be1 clone: perform a "local clone" when given a local path 
When git is given such a path, it will perform a "local clone",
bypassing the git-aware protocol and simply copying over all objects
that exist in the source.

Copy this behaviour when given a local path.
 2014-05-28 15:40:20 +02:00
Vicent Marti
5d91bea22a Merge pull request #2380 from libgit2/cmn/index-add-modes 
index: check for valid filemodes on add
 2014-05-28 13:55:57 +02:00
Vicent Marti
a470a5c71b Merge pull request #2377 from libgit2/cmn/dual-os 
travis: build on osx too
 2014-05-28 13:51:42 +02:00
Vicent Marti
07c0eacd87 Merge pull request #2359 from e45lee/chmod-fix 
Fixed permissions on template directories.
 2014-05-28 13:50:58 +02:00
Vicent Marti
ab882e21b4 Merge pull request #2385 from karipe/development 
Fix compile error on Visual Studio
 2014-05-28 13:49:38 +02:00
Vicent Marti
63e8c3fde2 Merge pull request #2337 from ethomson/merge_ff 
Introduce GIT_MERGE_CONFIG_* for merge.ff settings
 2014-05-28 13:47:55 +02:00