proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 11:18:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,309 Commits 2 Branches 0 Tags 22 MiB
a213a7bfa8
Commit Graph

6309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ben Straub
1574d3884f Merge pull request #2137 from jru/blame-first-parent 
Blame first-parent history
 2014-02-26 16:58:20 -05:00
Vicent Marti
6b34a4ed13 Merge pull request #2142 from ethomson/ignore_authors 
Remove "ignore" state from the git.git-authors
 2014-02-26 22:50:51 +01:00
Edward Thomson
f2abb72568 Remove "ignore" state from the git.git-authors 2014-02-26 12:39:48 -08:00
Juan Rubén
0276f0f55b Reset num_parents to 1 only for merge commits 
Also, correct test case to account for the boundary flag
 2014-02-26 19:25:07 +01:00
Miha
3536c168c3 - need_pack was not set to 0 when local fetch was already present causing negotiate_fetch access violation 2014-02-25 14:57:47 +01:00
Miha
300f44125a - BUGFIX #2133 (@fourplusone) in smart_protocol.c 
- added MSVC cmake definitions to disable warnings
- general.c is rewritten so it is ansi-c compatible and compiles ok on microsoft windows
- some MSVC reported warning fixes
 2014-02-25 11:56:11 +01:00
Vicent Marti
cb81c3a764 Merge pull request #2138 from ethomson/sysdir 
Move system directory cache out of utils
 2014-02-25 10:46:41 +01:00
Vicent Marti
1c8b339d34 Merge pull request #2139 from ethomson/va_copy_warning 
Include stdarg.h for the va_copy test
 2014-02-25 10:43:04 +01:00
Edward Thomson
4f46a98b6e Remove now-duplicated stdarg.h include 2014-02-24 23:32:25 -08:00
Edward Thomson
ab0af298da Include stdarg.h for the va_copy test 2014-02-24 21:56:08 -08:00
Edward Thomson
83634d38be Move system directory cache out of utils 2014-02-24 17:52:38 -08:00
Vicent Marti
98b9366212 Merge pull request #2134 from libgit2/ben/icc 
Fix Intel compiler warnings
 2014-02-24 23:01:01 +01:00
Ben Straub
c8893d1f00 Use a portable cast 2014-02-24 13:39:04 -08:00
Juan Rubén
899bd19a62 Document enumerator and rewording 2014-02-24 21:20:57 +01:00
Ben Straub
b1f2c2e255 Prevent icc warning 2014-02-24 05:33:14 -08:00
Ben Straub
8ac7da796b Avoid casting warning 2014-02-24 05:32:05 -08:00
Ben Straub
0d8265c8af Staticize file-local variables 2014-02-24 05:32:05 -08:00
Vicent Marti
f3e44dd64c Merge pull request #2132 from ethomson/merge_doc 
Improve documentation for merging
 2014-02-24 11:02:42 +01:00
Juan Rubén
9e3b901aeb Add unit test 2014-02-24 00:09:29 +01:00