proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 21:44:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,779 Commits 2 Branches 0 Tags 22 MiB
31b0cb518f
Commit Graph

6779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vicent Marti
4a759bfbcf Merge pull request #2165 from libgit2/revert-1997 
Revert pull request #1997
 2014-03-06 16:08:36 +01:00
Vicent Marti
2ab6d2cd47 Revert pull request #1997 2014-03-06 16:08:17 +01:00
Vicent Marti
4d116c3413 Merge pull request #1997 from mgbowen/merge-options-init-fix 
Fix GIT_MERGE_OPTS_INIT on MSVC.
 2014-03-06 16:08:12 +01:00
Vicent Marti
efc822ef0d Merge pull request #2014 from mgbowen/cpp-options-init 
Function-based options initializers
 2014-03-06 13:14:15 +01:00
Ben Straub
a5139485f7 Merge pull request #2162 from sunheehnus/dev 
examples/diff:Add the shortstat flag to examples/diff.c
 2014-03-05 19:50:23 -08:00
Sun He
6246de93b6 Merge completed: resolve the conflict with the upstream 2014-03-06 11:16:36 +08:00
Matthew Bowen
b9f819978c Added function-based initializers for every options struct. 
The basic structure of each function is courtesy of arrbee.
 2014-03-05 21:49:23 -05:00
Vicent Marti
a064dc2d0b Merge pull request #2159 from libgit2/rb/odb-exists-prefix 
Add ODB API to check for existence by prefix and object id shortener
 2014-03-06 00:47:05 +01:00
Russell Belfer
26875825df Check short OID len in odb, not in backends 2014-03-05 13:06:22 -08:00
Vicent Marti
a62ad3c353 Merge pull request #2164 from libgit2/cmn/refs-delete-iteration 
refdb: catch a directory disappearing
 2014-03-05 21:07:20 +01:00
Vicent Marti
967d3f2e3e Merge pull request #2163 from ethomson/nobackend_odb_write 
ODB writing fails gracefully when unsupported
 2014-03-05 21:06:59 +01:00
Carlos Martín Nieto
a213a7bfa8 refdb: catch a directory disappearing 
If a directory disappears between the time we look up the entries of its
parent and the time when we go to look at it, we should ignore the error
and move forward.

This fixes #2046.
 2014-03-05 21:00:15 +01:00
Edward Thomson
7bd2f40154 ODB writing fails gracefully when unsupported 
If no ODB backends support writing, we should fail gracefully.
 2014-03-05 11:35:47 -08:00
Jiri Pospisil
feebe6150f Move all variable declarations to the top of the block 2014-03-05 20:31:15 +01:00
Jiri Pospisil
a53b858417 Add tag example 2014-03-05 20:31:15 +01:00
Jiri Pospisil
4ae4a9bbd1 Fix typo 2014-03-05 20:31:15 +01:00
Sun He
8384a50a21 fix the output format of diff 2014-03-05 20:33:20 +08:00
Sun He
45d2e8dc46 Add the --shortstat flag to examples/diff.c 2014-03-05 20:13:34 +08:00
Vicent Marti
68581754f3 Merge pull request #2160 from modocache/examples-diff-add-patience-and-minimal 
examples/diff: Add minimal, patience diff options.
 2014-03-05 11:42:50 +01:00
Vicent Marti
d2b7841d66 Merge pull request #2161 from softwarenerd/softwarenerd 
Fixed missing error check on call to git_remote_download
 2014-03-05 11:37:08 +01:00
Brian Lambert
06a8f5c3b2 Fixed missing error check on call to git_remote_download in git_remote_fetch. Moved error check to statement following git_remote_disconnect so that the disconnect happens regardless of the result of the download call. 2014-03-05 00:00:41 -05:00
Brian Gesiak
0d3c8a9d92 examples/diff: Add minimal, patience diff options. 
- Add minimal, patience diff options to diff example. libgit2
  `diff_xdiff.git_xdiff_init` already supports these flags, so
  no additional change is necessary.
- Remove minimal and patience flag addition from project list.
 2014-03-05 13:06:31 +09:00
Russell Belfer
13f7ecd7b9 Add git_object_short_id API to get short id string 
This finds a short id string that will unambiguously select the
given object, starting with the core.abbrev length (usually 7)
and growing until it is no longer ambiguous.
 2014-03-04 16:23:28 -08:00
Russell Belfer
f5753999e4 Add exists_prefix to ODB backend and ODB API 2014-03-04 15:34:23 -08:00
Vicent Marti
66d9e0461c Merge pull request #2157 from libgit2/cmn/write-object-mem 
pack-objects: free memory safely
 2014-03-04 21:01:39 +01:00
Carlos Martín Nieto
a14aa1e789 pack-objects: free memory safely 
A few fixes have accumulated in this area which have made the freeing of
data a bit muddy. Make sure to free the data only when needed and once.

When we are going to write a delta to the packfile, we need to free the
data, otherwise leave it. The current version of the code mixes up the
checks for po->data and po->delta_data.
 2014-03-04 20:11:50 +01:00
Russell Belfer
0a62caf4e4 Merge pull request #2155 from jacquesg/stash-save-remove-ignored 
Remove ignored files from the working directory if they were stashed
 2014-03-04 10:21:41 -08:00
Jacques Germishuys
4636ca9391 Remove ignored files from the working directory if they were stashed 2014-03-04 12:22:27 +02:00
Vicent Marti
c2e8374574 Merge pull request #2148 from fourplusone/patch-1 
Added a test, that fails for #2133
 2014-03-03 17:48:32 +01:00
Matthias Bartelmeß
d113791d8f Added a test, that fails for #2133 2014-03-03 16:10:29 +01:00
Vicent Marti
0511b15c82 Merge pull request #2141 from ravselj/development 
BUGFIX - Fetching twice from the same remote causes a segfault
 2014-03-03 15:05:26 +01:00
Miha Ravšelj
b43f35fde2 - examples CMakeLists.txt reverted to previous state 2014-03-03 14:59:50 +01:00
Vicent Marti
bb3687c5a8 Merge pull request #2151 from arthurschreiber/patch-3 
Fix the description for `GIT_FEATURE_SSH`.
 2014-03-03 13:12:27 +01:00
Arthur Schreiber
96484ecd9e Fix the description for GIT_FEATURE_SSH. 2014-03-03 12:59:35 +01:00
Vicent Marti
f34b9a5984 Merge pull request #2150 from libgit2/vmg/features 
caps: Rename to features to avoid confusion
 2014-03-03 12:45:46 +01:00
Vicent Marti
ebb3c506fd features: Rename _HAS_ to _FEATURE_ 2014-03-03 12:40:25 +01:00
Vicent Marti
2491c416ed caps: Rename the enum name too! 2014-03-03 12:13:17 +01:00
Vicent Marti
c9f5298b0e caps: Rename to features to avoid confusion 2014-03-03 12:10:36 +01:00
Miha
6874cafd84 cmake examples change so that general.c is off by default 2014-03-03 12:08:17 +01:00
Miha
058956ce7f - CMakeLists.txt small fix 2014-03-03 11:47:06 +01:00
Miha
0330469f6d - general.c reverted to original( before pr state ) 2014-03-03 11:42:25 +01:00
Miha
b5212858f1 Merge remote-tracking branch 'remotes/upstream/development' into development 2014-03-03 11:40:22 +01:00
Ben Straub
494be429ad Merge pull request #2144 from linquize/branch-f-current 
Do not allow git_branch_create() to force update branch
 2014-03-02 09:00:00 -06:00
Linquize
1d08b72e4f Add unit test to show git_branch_create() fails if attempt to force create current branch 2014-03-02 19:14:20 +08:00
Vicent Marti
9776cb84fa Merge pull request #2143 from libgit2/rb/projects 
Add project list and update readme
 2014-03-01 18:06:49 +01:00
Vicent Marti
06d41826b6 Merge pull request #2146 from libgit2/rb/diff-b2b 
Add git_diff_buffers and git_patch_from_buffers
 2014-02-28 09:40:17 +01:00
Russell Belfer
6789b7a75d Add buffer to buffer diff and patch APIs 
This adds `git_diff_buffers` and `git_patch_from_buffers`.  This
also includes a bunch of internal refactoring to increase the
shared code between these functions and the blob-to-blob and
blob-to-buffer APIs, as well as some higher level assert helpers
in the tests to also remove redundancy.
 2014-02-27 14:13:22 -08:00
Russell Belfer
d88399922f Fix warnings and code style issues 2014-02-27 14:01:16 -08:00
Linquize
59b1dbcd7a Do not allow git_branch_create() to force update branch 2014-02-27 23:56:25 +08:00
Russell Belfer
486bc36689 Add project list and update readme 2014-02-26 16:37:08 -08:00