proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-16 15:12:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,089 Commits 2 Branches 0 Tags 22 MiB
bf522e0811
Commit Graph

6089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Thomson
5588f07360 Clean up warnings 2013-12-09 11:40:44 -05:00
Carlos Martín Nieto
f21051297c refs: expose has_log() on the backend 
The frontend used to look at the file directly, but that's obviously not
the right thing to do. Expose it on the backend and use that function
instead.
 2013-12-09 15:55:11 +01:00
Carlos Martín Nieto
8d5ec9106a refs: expose a way to ensure a ref has a log 
Sometimes (e.g. stash) we want to make sure that a log will be written,
even if it's not in one of the standard locations. Let's make that
easier.
 2013-12-09 15:55:11 +01:00
Carlos Martín Nieto
6f13a30565 reflog: write to the reflog following git's rules 
git-core only writes to the reflogs of HEAD, refs/heads/ and,
refs/notes/ or if there is already a reflog in place. Adjust our code to
follow these semantics.
 2013-12-09 15:55:11 +01:00
Edward Thomson
07c5dc84fd Merge pull request #1994 from palistov/commit-cleanup 
commit: Fix potential segfault
 2013-12-08 12:36:48 -08:00
Paul Holden
be0a1a7958 commit: Fix potential segfault in git_commit_message 
Dereferencing commit pointer before asserting
 2013-12-08 10:21:13 -08:00
Vicent Marti
65e726a8ec Merge pull request #1993 from jaredlwong/development 
Fixed left shift size of int.
 2013-12-08 06:43:52 -08:00
Jared Wong
307a3d6762 Fixed left shift size of int. 
Simply switched the ordering of the checks in the for loop where this left
shift was being made.
 2013-12-08 01:50:10 -08:00
Ben Straub
a7c83aec21 Clarify docs 2013-12-06 13:39:08 -08:00
Ben Straub
7fb4147f1f Don't clobber whitespace settings 2013-12-06 13:38:59 -08:00
Ben Straub
710f383868 Clarify default value and behavior 2013-12-06 09:32:09 -08:00
Vicent Martí
c4fcae5f7c Merge pull request #1989 from palistov/blame-cleanup 
blame.c: Remove unnecessary error-check and goto
 2013-12-06 04:29:59 -08:00
Paul Holden
8f460f2c46 blame.c: Remove unnecessary error-check and goto 
In private function 'load_blob'.
 2013-12-05 20:42:14 -08:00
Ben Straub
628e92cdb3 Don't use weird return codes 2013-12-05 14:47:04 -08:00
Ben Straub
c56c6d6945 Implement GIT_DIFF_FIND_BY_CONFIG 2013-12-05 14:13:46 -08:00
Vicent Martí
98c248d7bf Merge pull request #1988 from mgbowen/fix-libssh2-windows 
Fixed compilation on Windows when using libssh2.
 2013-12-05 08:43:29 -08:00
mgbowen
ed5b77b0fd Fixed compilation on Windows when using libssh2. 2013-12-05 11:13:58 -05:00
Ben Straub
a6ebc2bdb3 Introduce GIT_DIFF_FIND_BY_CONFIG 2013-12-05 08:11:00 -08:00
Edward Thomson
cf297c353f Merge pull request #1984 from ethomson/revert_fix 
Reorder revert test variable decls
 2013-12-03 08:03:56 -08:00
Edward Thomson
d192e60b7a Reorder var decls in revert test 
Oh, MSVC.
 2013-12-03 10:47:18 -05:00
Vicent Martí
9f802b5b26 Merge pull request #1983 from ethomson/revert 
Bare naked merge and rebase
 2013-12-03 07:40:30 -08:00
Edward Thomson
eac938d96e Bare naked merge and rebase 2013-12-03 10:18:53 -05:00
Vicent Martí
553d33732a Merge pull request #1982 from linquize/revert.h 
Include git2/revert.h in git2.h
 2013-12-03 07:05:52 -08:00
Linquize
d706e843e1 Include git2/revert.h in git2.h 2013-12-03 23:00:50 +08:00
Vicent Martí
a149a18923 Merge pull request #1981 from jamill/download_cancel_tweaks 
Updates to cancellation logic during download and indexing of packfile.
 2013-12-03 02:14:28 -08:00
Vicent Martí
db0a7e39b3 Merge pull request #1977 from ethomson/revert 
Revert support for a single commit
 2013-12-03 02:11:55 -08:00
Jameson Miller
db4cbfe504 Updates to cancellation logic during download and indexing of packfile. 2013-12-02 23:05:10 -05:00
Edward Thomson
bab0b9f2d2 clean up state metadata more consistently 2013-12-02 16:57:41 -06:00
Edward Thomson
300d192f7e Introduce git_revert to revert a single commit 2013-12-02 16:57:41 -06:00
Vicent Martí
96fb6a647f Merge pull request #1979 from libgit2/rb/diff-find-delete-unmod 
Add GIT_DIFF_FIND_REMOVE_UNMODIFIED flag and fix copy detection bug
 2013-12-02 13:56:28 -08:00
Russell Belfer
f62c174d0d GIT_DIFF_FIND_REMOVE_UNMODIFIED sounds better 2013-12-02 13:49:58 -08:00
Russell Belfer
97ad85b88d Add GIT_DIFF_FIND_DELETE_UNMODIFIED flag 
When doing copy detection, it is often necessary to include
UNMODIFIED records in the git_diff so they are available as source
records for GIT_DIFF_FIND_COPIES_FROM_UNMODIFIED.  Yet in the final
diff, often you will not want to have these UNMODIFIED records.
This adds a flag which marks these UNMODIFIED records for deletion
from the diff list so they will be removed after the rename detect
phase is over.
 2013-12-02 13:30:05 -08:00
Russell Belfer
2123a17f83 Fix bug making split deltas a COPIED targets 
When FIND_COPIES is used in combination with BREAK_REWRITES for
rename detection, there was a bug where the split MODIFIED delta
was only used as a target for RENAME records and not for COPIED
records.  This fixes that, converting the split into a pair of
DELETED and COPIED deltas when that circumstance arises.
 2013-12-02 13:27:06 -08:00
Vicent Martí
da02ebe37e Merge pull request #1978 from libgit2/rb/cmake-find-iconv 
Improve iconv finding for cmake
 2013-12-02 11:59:31 -08:00
Russell Belfer
726b75d1b8 Improve iconv finding for cmake 
* add FindIconv helper for CMake iconv detection
* only default using iconv to ON for MacOS
* update pkg-config generation to include iconv dependency better
 2013-12-02 11:32:37 -08:00
Vicent Martí
14984af6cb Merge pull request #1975 from nikai3d/patch-2 
fix typos in docs
 2013-12-01 04:10:51 -08:00
Nicolas Kaiser
27f680a998 fix typos in docs 2013-12-01 10:35:56 +01:00
Vicent Martí
ca1fba5115 Merge pull request #1974 from ghedo/strnlen 
posix: Solaris doesn't have strnlen either
 2013-11-27 05:36:13 -08:00
Alessandro Ghedini
758f2f1022 posix: Solaris doesn't have strnlen either 2013-11-27 14:31:22 +01:00
Carlos Martín Nieto
13c9e44af9 reflog: remove git_reflog_append_to() 
This was a convenience method for the refs front-end to do the reflog
writing. This is now done in the backend and it has no more reason for
being.
 2013-11-23 14:55:02 +01:00
Carlos Martín Nieto
a57dd3b7a4 reflog: integrate into the ref writing 
Whenever a reference is created or updated, we need to write to the
reflog regardless of whether the user gave us a message, so we shouldn't
leave that to the ref frontend, but integrate it into the backend.

This also eliminates the race between ref update and writing to the
reflog, as we protect the reflog with the ref lock.

As an additional benefit, this reflog append on the backend happens by
appending to the file instead of parsing and rewriting it.
 2013-11-23 14:55:02 +01:00
Carlos Martín Nieto
110df89317 refdb: add a message parameter for appending to the log 
This is as yet unused.
 2013-11-23 13:35:53 +01:00
Carlos Martín Nieto
a6b508080c refs: adjust to the new reflog API 2013-11-23 13:35:53 +01:00
nulltoken
ca84e05850 refs: Introduce git_reference_symbolic_set_target_with_log() 2013-11-23 13:35:53 +01:00
nulltoken
14ab0e100e refs: Introduce git_reference_set_target_with_log() 2013-11-23 13:35:51 +01:00
nulltoken
56ad3782e0 refs: Introduce git_reference_symbolic_create_with_log() 2013-11-23 13:34:51 +01:00
nulltoken
bba25f39a2 refs: Introduce git_reference_create_with_log() 2013-11-23 13:34:46 +01:00
nulltoken
92f95a170c refs: Centralize reference creation logic 2013-11-23 13:32:25 +01:00
Vicent Martí
a2e873d1a1 Merge pull request #1972 from ghedo/ssh_agent 
ssh: add support for ssh-agent authentication
 2013-11-20 07:06:35 -08:00
Alessandro Ghedini
138e014c38 transport: document ssh-agent authentication 2013-11-20 14:25:55 +01:00