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
7,030 Commits 2 Branches 0 Tags 22 MiB
aa5cdf63bf
Commit Graph

7030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Martín Nieto
aa5cdf63bf status: failing test with slash-star 
When writing 'bin/*' in the rules, this means we ignore very file inside
bin/ individually, but do not ignore the directory itself. Thus the
status listing should list both files under bin/, one untracked and one
ignored.
 2014-08-08 14:53:22 -07:00
Russell Belfer
f25bc0b2e6 Fix rejection of parent dir of negated ignores 
While scanning through a directory hierarchy, this prevents a
positive ignore match on a parent directory from blocking the scan
of a directory when a negative match rule exists for files inside
the directory.
 2014-08-08 14:51:36 -07:00
Vicent Marti
35f186b6ca Merge pull request #2506 from libgit2/rb/ignore-pipes-etc 
Don't report status on named pipes
 2014-08-08 22:28:27 +02:00
Russell Belfer
f18234fad6 Don't report status on named pipes 
Git skips entries in directories that are not S_ISDIR, S_ISREG, or
S_ISLNK, so let's make libgit2 do the same thing.
 2014-08-08 13:17:50 -07:00
Vicent Marti
8f759ac0b3 Merge pull request #2471 from jacquesg/compatibility-cleanup 
Compatibility/Portability cleanup
 2014-08-07 18:00:57 +02:00
Jacques Germishuys
07d03d3145 Introduce some consistency in definition/declaration ordering 2014-08-05 20:52:00 +02:00
Jacques Germishuys
662f90e6ec Move p_realpath logic to realpath.c 2014-08-05 20:52:00 +02:00
Jacques Germishuys
c7dd0a56bf Use p_snprintf also in tests 2014-08-05 20:51:59 +02:00
Jacques Germishuys
c983604eb1 Consistently use p_snprintf 2014-08-05 20:51:59 +02:00
Jacques Germishuys
2f795d8fc5 Cleanup portability/compatibility layer 
* Removes mingw-compat.h
* Cleans up separation of compiler/platform idiosyncrasies
* Unifies mingw/msvc stat structures and functions
* (Tries to) hide more compiler specific implementation details (even in our internal API)
 2014-08-05 20:51:59 +02:00
Jacques Germishuys
d07fd4425f Define WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH if not defined 2014-08-05 20:51:59 +02:00
Jacques Germishuys
959a93e716 Silence unused variables warnings 2014-08-05 20:51:59 +02:00
Vicent Marti
e0af2517bf Merge pull request #2503 from jacquesg/solaris-http-parser 
Solaris doesn't necessarily have stdint.h, use inttypes.h
 2014-08-05 20:28:22 +02:00
Jacques Germishuys
66d1595436 Solaris doesn't necessarily have stdint.h, use inttypes.h 2014-08-05 19:51:29 +02:00
Vicent Marti
59e3f45b61 Merge pull request #2487 from libgit2/cmn/revwalk-no-prealloc 
Work around strict aliasing in array growth
 2014-07-25 11:27:51 +02:00
Carlos Martín Nieto
b62a6a13b2 array: mark the array to grow as volatile 
This works around strict aliasing rules letting some versions of
GCC (particularly on RHEL 6) thinking that they can skip updating the
size of the array when calculating the next element's offset.
 2014-07-25 08:25:41 +02:00
Carlos Martín Nieto
9746b36cf9 revwalk: remove preallocation of the uninteresting commits 
Preallocating two commits doesn't make much sense as leaving allocation
to the first array usage will allocate a sensible size with room for
growth.

This preallocation has also been hiding issues with strict aliasing in
the tests, as we have fairly simple histories and never trigger the
growth.
 2014-07-24 17:52:28 +02:00
Vicent Marti
9de6ec5200 Merge pull request #2477 from ethomson/merge 
Don't allow conflicts by default
 2014-07-23 09:41:52 +02:00
Vicent Marti
243db06ce3 Merge pull request #2484 from libgit2/fix-git-status-list-new-unreadable-folder 
Fix git status list new unreadable folder
 2014-07-23 07:57:20 +02:00
Alan Rogers
85b7268e38 undo indentation change in diff_print.c 2014-07-23 12:17:02 +10:00
Vicent Marti
bf9a7e0607 Merge pull request #2485 from ethomson/cherrypick 
Rename git_cherry_pick to git_cherrypick
 2014-07-22 20:30:26 +02:00
Edward Thomson
0ba4dca526 git_cherry_pick -> git_cherrypick 2014-07-22 10:40:23 -04:00
Alan Rogers
7d0ab0fae0 Merge remote-tracking branch 'origin/master' into fix-git-status-list-new-unreadable-folder 2014-07-22 15:08:24 +10:00
Alan Rogers
e824e63de6 Remove debug printfs. 2014-07-22 11:25:56 +10:00
Alan Rogers
35b1471f01 Move the UNREADABLE enums to the correct group. 2014-07-22 11:17:42 +10:00
Edward Thomson
994404b506 Don't allow conflicts by default 2014-07-17 01:25:31 -04:00
Vicent Marti
091165c53b Merge pull request #2475 from libgit2/expose-buffer-binary-detection 
Export git_buf_text_is_binary and git_buf_text_contains_nul.
 2014-07-16 14:21:53 -07:00
joshaber
b3af2d80d2 Just put it all in buffer. 2014-07-16 13:34:25 -07:00
Vicent Marti
ec813d83e7 Merge pull request #2476 from linquize/config-lf-eof 
When adding new config section, handle config file not ending with LF
 2014-07-16 13:07:17 -07:00
Vicent Marti
8baeb8a480 ssh: Fix unused warning 2014-07-16 13:03:34 -07:00
Vicent Marti
84a85d1bec clone: should_clone? Of course we should clone. That's not the question 2014-07-16 13:03:07 -07:00
Vicent Marti
ed99e0b54f Merge pull request #2467 from ethomson/win_local_clone 
Handle local file:/// paths on Windows
 2014-07-16 13:00:15 -07:00
Linquize
693748694b Add unit test to test add section without lf at EOF 2014-07-16 21:54:53 +08:00
Linquize
991dab2dd0 Make sure \n is at the end of config file before a new section is written 2014-07-16 21:09:53 +08:00
joshaber
df4cba0f28 Export git_buf_text_is_binary and git_buf_text_contains_nul. 
So that users don’t need to implement binary detection themselves.
 2014-07-15 17:38:39 -07:00
Vicent Marti
ad082501a7 Merge pull request #2472 from jacquesg/perl-link 
Update perl bindings link
 2014-07-15 11:00:27 -07:00
Vicent Marti
851ae37ea0 Merge pull request #2474 from ethomson/clar_file_report 
Switch description and message reporting in `clar__assert_equal_file`
 2014-07-15 10:58:02 -07:00
Edward Thomson
3d997dc255 Switch description and path reporting 2014-07-15 10:00:46 -04:00
Jacques Germishuys
2ef20da02e Updated perl bindings link 2014-07-13 17:52:33 +02:00
Jacques Germishuys
f59a34d2e6 Only create openssl_locks if thread support is enabled 2014-07-13 16:23:17 +02:00
Jacques Germishuys
529c37156d Fix unix/posix.h include guard 2014-07-13 16:23:16 +02:00
Edward Thomson
529fd30d1f Handle local file:/// paths on Windows 
Windows can't handle a path like `/c:/foo`; when turning file:///
URIs into local paths, we must strip the leading slash.
 2014-07-11 18:46:00 -04:00
Vicent Marti
a6d7e16634 Merge pull request #2466 from jacquesg/win2003-platform-sdk 
Windows compatibility fixes
 2014-07-11 16:51:43 +02:00
Vicent Marti
44cfb6f387 Merge pull request #2463 from libgit2/cmn/ssh-factory-for-paths 
ssh: provide a factory function for setting ssh paths
 2014-07-11 16:49:23 +02:00
Vicent Marti
863dabdaba Merge pull request #2465 from libgit2/cmn/refspec-start-middle 
Support refspecs with the asterisk in the middle
 2014-07-11 16:47:41 +02:00
Carlos Martín Nieto
356b891e3e Merge pull request #2468 from Airbitz/pack-error-reporting 
Properly report failure when expanding a packfile
 2014-07-11 14:19:35 +02:00
Carlos Martín Nieto
0dbbfbb649 Merge pull request #2457 from ethomson/merge_fix 
merge: don't open COMMIT_MSG unless we need to append conflicts
 2014-07-11 14:18:49 +02:00
Carlos Martín Nieto
eb5f03461f checkout: fix docs formatting for the options 2014-07-11 12:22:48 +02:00
Alan Rogers
4edd1a036b Merge remote-tracking branch 'origin/development' into fix-git-status-list-new-unreadable-folder 2014-07-10 19:17:34 -07:00
William Swanson
01b432cf35 Properly report failure when expanding a packfile 2014-07-09 14:12:30 -07:00