proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 09:09:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,218 Commits 2 Branches 0 Tags 22 MiB
aa3af01db0
Commit Graph

8218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Thomson
aa3af01db0 index iterator: optionally include conflicts 2015-05-28 09:43:41 -04:00
Carlos Martín Nieto
c7f9412356 Merge pull request #3160 from b4n/ident-same-as-git 
Fix ident replacement to match Git behavior
 2015-05-28 02:40:22 +02:00
Colomban Wendling
1ecbcd8e51 Fix ident replacement to match Git behavior 
Git inserts a space after the SHA1 (as of 2.1.4 at least), so do the
same.
 2015-05-26 19:56:06 +02:00
Carlos Martín Nieto
c11daac9de Merge pull request #3151 from ethomson/thinpack 
Thin packs: don't
 2015-05-22 22:12:40 +02:00
Edward Thomson
e2dd3735a5 indexer: avoid loading already existent bases 
When thickening a pack, avoid loading already loaded bases and
trying to insert them all over again.
 2015-05-22 15:27:52 -04:00
Edward Thomson
38c10ecd99 indexer: don't look for the index we're creating 
When creating an index, know that we do not have an index for
our own packfile, preventing some unnecessary file opens and
error reporting.
 2015-05-22 15:27:48 -04:00
Edward Thomson
2540487fcd Merge pull request #3108 from libgit2/cmn/ssl-no-want 
openssl: don't try to handle WANT_READ or WANT_WRITE
 2015-05-22 12:53:52 -04:00
Carlos Martín Nieto
ca183d2736 travis: build maint branches 2015-05-22 17:44:28 +02:00
Carlos Martín Nieto
a6ea108b56 Merge branch 'sni' 2015-05-21 14:04:46 +02:00
Cristian Oneț
987045c74a Call the openssl API to be able to work with SNI servers. 2015-05-21 14:03:44 +02:00
Carlos Martín Nieto
5d74fb7839 Merge pull request #3145 from stinb/fix_cxx_build 
Fix error when building as C++.
 2015-05-21 06:32:29 +02:00
Carlos Martín Nieto
6675aaba88 Merge pull request #3146 from ethomson/add_untracked_files 
index_add_all: include untracked files in new subdirs
 2015-05-21 04:58:16 +02:00
Edward Thomson
cbfeecf33f git_index_add_all: don't recurse ignored dirs 
No need to get reports about individual ignored files, having a
single ignored directory delta is enough.
 2015-05-20 20:14:31 -04:00
Edward Thomson
3e85be2bf1 Merge pull request #3144 from libgit2/cmn/ignored-ignore 
ignore: clear the error when matching a pattern negation
 2015-05-20 20:07:39 -04:00
Edward Thomson
fa9a969d80 index_add_all: include untracked files in new subdirs 2015-05-20 20:05:55 -04:00
Jason Haslam
d30155f2f9 Fix error when building as C++. 2015-05-20 14:26:05 -06:00
Carlos Martín Nieto
2c57114f11 ignore: clear the error when matching a pattern negation 
When we discover that we want to keep a negative rule, make sure to
clear the error variable, as it we otherwise return whatever was left by
the previous loop iteration.
 2015-05-20 21:49:02 +02:00
Carlos Martín Nieto
cd3f3c2844 Add a missing include for reset 
Our doc parser really wants the types to be declared in the header it's
reading.
 2015-05-20 21:06:01 +02:00
Carlos Martín Nieto
c06e180a98 Merge pull request #3137 from libgit2/cmn/server-errors 
Improve server error reporting
 2015-05-20 17:13:49 +02:00
Carlos Martín Nieto
1396c38178 errors: add GIT_EEOF to indicate early EOF 
This can be used by tools to show mesages about failing to communicate
with the server. The error message in this case will often contain the
server's error message, as far as it managed to send anything.
 2015-05-20 15:08:39 +02:00
Carlos Martín Nieto
e3435673b8 ssh: read from stderr if stdout is empty 
When we fail to read from stdout, it's typically because the URL was
wrong and the server process has sent some output over its stderr
output.

Read that output and set the error message to whatever we read from it.
 2015-05-20 15:08:39 +02:00
Edward Thomson
acc573cba3 Merge pull request #3109 from libgit2/cmn/index-use-diff 
Use a diff for iteration in index_update_all and index_add_all
 2015-05-19 14:12:40 -04:00
Edward Thomson
0aa603363e Merge pull request #3132 from libgit2/cmn/path-direach-cberror 
Provide error messages for git_path_direach operations
 2015-05-19 14:07:03 -04:00
Carlos Martín Nieto
edef91ee25 fileops: set an error on write error for file copy 
We set an error if we get an error when reading, but we don't bother
setting an error message for write failing. This causes a cryptic error
to be shown to the user when the target filesystem is full.
 2015-05-17 15:48:33 +02:00
Carlos Martín Nieto
54738368ec fileops: set an error message if we fail to link a file 
Now that `git_path_direach` lets us specify an error message to report,
set an appropriate error message while linking.
 2015-05-15 12:18:05 +02:00
Carlos Martín Nieto
8a4d77f990 path: don't let direach overwrite the callback's error message 
This function deals with functions doing IO which means the amount of
errors that can happen is quit large. It does not help if it always
ovewrites the underlying error message with a less understandable
version of "something went wrong".

Instead, only use this generic message if there was no error set by the
callback.
 2015-05-15 12:15:45 +02:00
Carlos Martín Nieto
9042693e28 Merge pull request #3130 from mortonfox/patch-1 
Updated dlibgit link.
 2015-05-15 10:10:24 +02:00
Carlos Martín Nieto
481ac3d1b3 Merge pull request #3129 from Therzok/patch-2 
Bring Early EOF message in line with the other two
 2015-05-14 21:51:45 +02:00
Morton Fox
e702dc2e24 Updated dlibgit link. 2015-05-14 15:49:51 -04:00
Marius Ungureanu
7e9a240e0a Make "Early EOF" message start with lowercase 2015-05-14 21:39:52 +03:00
Carlos Martín Nieto
542a7de0cd local: plug a leak in the progress reporting 2015-05-14 17:26:09 +02:00
Carlos Martín Nieto
874cc35a8d index: add a CHANGELOG entry for the diff usage 2015-05-14 15:24:15 +02:00
Carlos Martín Nieto
2b2dfe80f0 index: include TYPECHANGE in the diff 
Without this option, we would not be able to catch exec bit changes.
 2015-05-14 15:23:12 +02:00
Carlos Martín Nieto
0a78a52ed9 index: make add_all to act on a diff 
Instead of going through each entry we have and re-adding, which may not
even be correct for certain crlf options and has bad performance, use
the function which performs a diff against the worktree and try to add
and remove files from that list.
 2015-05-14 15:23:12 +02:00
Carlos Martín Nieto
197307f6b1 index: refactor diff-based update_all to match other applies 
Refactor so we look like the code we're replacing, which should also
allow us to more easily inplement add-all.
 2015-05-14 15:23:12 +02:00
Carlos Martín Nieto
713e11e0b1 index: use a diff to perform update_all 
We currently iterate over all the entries and re-add them to the
index. While this provides correctness, it is wasteful as we try to
re-insert files which have not changed.

Instead, take a diff between the index and the worktree and only re-add
those which we already know have changed.
 2015-05-14 15:23:12 +02:00
Edward Thomson
4a6a67461d Merge pull request #3128 from libgit2/cmn/push-notify-deleted 
Add tests for and fix push negotiation notification
 2015-05-14 09:10:20 -04:00
Carlos Martín Nieto
254ff3e929 push: fix the update constructor 
There was a copypasta error and the source and destination IDs were
reversed.
 2015-05-14 10:34:42 +02:00
Carlos Martín Nieto
041ad7dbd6 push: add tests for the push negotiation callback 
The functionality was meged without including tests, so let's add them
now.
 2015-05-14 10:34:05 +02:00
Carlos Martín Nieto
98270f56d1 Add CHANGELOG entry for index entry changes 2015-05-14 08:26:02 +02:00
Carlos Martín Nieto
16d742ebdb Merge pull request #3119 from ethomson/ignore 
Attributes: don't match files for folders
 2015-05-13 21:43:58 +02:00
Edward Thomson
cd430bc786 Merge pull request #3103 from libgit2/cmn/local-push-message 
Use the packbuilder in local push
 2015-05-13 14:26:20 -04:00
Edward Thomson
2ec73fa9ed Merge pull request #3102 from libgit2/cmn/pack-objects-report 
Show progress during packing for the local transport
 2015-05-13 14:26:06 -04:00
Edward Thomson
a6f2ceaf48 Merge pull request #3118 from libgit2/cmn/stream-size 
odb: make the writestream's size a git_off_t
 2015-05-13 12:11:55 -04:00
Edward Thomson
882cc37f83 attr tests: make explicit our dir/file match tests 2015-05-13 10:56:55 -04:00
Carlos Martín Nieto
3e529e9d2d Fix a few leaks 
The interesting one is the notification macro, which was returning
directly on a soft-abort instead of going through the cleanup.
 2015-05-13 16:40:18 +02:00
Carlos Martín Nieto
3c337a5d37 packbuilder: report progress during deltification 
This is useful to send to the client while we're performing the work.

The reporting function has a force parameter which makes sure that we
do send out the message of 100% completed, even if this comes before the
next udpate window.
 2015-05-13 15:52:13 +02:00
Carlos Martín Nieto
8cec2b8ae9 local: send the packbuilder progress via the sideband 
Set a callback for the packbuilder so we can send the sideband messages
to the caller, formatting them as git would.
 2015-05-13 15:52:13 +02:00
Carlos Martín Nieto
cf66c4748c examples: show the sideband progress on clone 
This lets us see what the server (or libgit2 locally) is doing, rather
than having to stare at a non-moving screen.
 2015-05-13 15:52:12 +02:00
Edward Thomson
d01737b419 Merge pull request #3117 from libgit2/cmn/index-more-accurate 
index: make the entries have more accurate sizes
 2015-05-13 09:11:38 -04:00