proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-27 22:24:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,647 Commits 2 Branches 0 Tags 22 MiB
aab8f5af4b
Commit Graph

3647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edward Thomson
aab8f5af4b hey don't stomp on my memory! 2012-12-04 16:40:09 -06:00
Russell Belfer
46e4227695 Merge pull request #1111 from ethomson/conflictstatus 
status should ignore conflicts entries in the index
 2012-12-03 13:20:39 -08:00
Edward Thomson
b241466133 status should ignore conflicts entries in the index 2012-12-03 14:51:39 -06:00
Vicent Martí
3368c520dc Merge pull request #1112 from barrbrain/odb-pack-read-header 
odb-pack: resurrect pack_backend__read_header
 2012-12-03 07:38:58 -08:00
Vicent Marti
7ea3a79f0c Vade retro satana 2012-12-03 16:04:39 +01:00
Vicent Martí
e6b013a042 Merge pull request #1063 from nulltoken/topic/invalid-name 
EINVALIDSPEC
 2012-12-03 06:26:41 -08:00
David Michael Barr
bfb8bcc1df odb-pack: resurrect pack_backend__read_header 2012-12-03 10:39:17 +11:00
David Michael Barr
44f9f54797 pack: add git_packfile_resolve_header 
To paraphrase @peff:

You can get both size and type from a packed object reasonably cheaply.
If you have:

* An object that is not a delta; both type and size are available in the
  packfile header.
* An object that is a delta. The packfile type will be OBJ_*_DELTA, and
  you have to resolve back to the base to find the real type. That means
  potentially a lot of packfile index lookups, but each one is
  relatively cheap. For the size, you inflate the first few bytes of the
  delta, whose header will tell you the resulting size of applying the
  delta to the base.

For simplicity, we just decompress the whole delta for now.
 2012-12-03 10:39:17 +11:00
nulltoken
cc1466264a revparse: Deploy EINVALIDSPEC usage 2012-12-01 08:34:31 +01:00
nulltoken
84166facc9 revparse: remove timezone setup in tests 2012-12-01 08:34:30 +01:00
nulltoken
bc05f30c47 object: refine git_object_peel() error report 2012-12-01 08:34:29 +01:00
nulltoken
621730383a branch: Deploy EINVALIDSPEC usage 2012-12-01 08:34:28 +01:00
nulltoken
18d6f12040 tag: Deploy EINVALIDSPEC usage 2012-12-01 08:34:28 +01:00
nulltoken
80212ecb1c reflog: Deploy EINVALIDSPEC usage 2012-12-01 08:34:27 +01:00
nulltoken
e4aa7f58fe refs: cover git_reference_name_to_oid() unfound behavior 2012-12-01 08:34:26 +01:00
nulltoken
80d9d1df14 refs: Deploy EINVALIDSPEC usage 2012-12-01 08:34:26 +01:00
nulltoken
47261d9c8a tests: drop unused variables 2012-12-01 08:34:25 +01:00
nulltoken
83458bb77f refs: Fix error clearing 2012-12-01 08:34:24 +01:00
nulltoken
032ba9e4ad remote: deploy EINVALIDSPEC usage 2012-12-01 08:34:23 +01:00
nulltoken
8b50935a69 errors: Introduce EINVALIDSPEC error code 2012-12-01 08:34:22 +01:00
nulltoken
3da73c40fc Fix compilation warnings 2012-12-01 08:34:21 +01:00
David Michael Barr
d1b6ea8ad1 delta-apply: add git__delta_read_header 2012-12-01 14:50:45 +11:00
Carlos Martín Nieto
da82043736 graph: plug leak 2012-11-30 15:26:45 +01:00
Carlos Martín Nieto
2d6aedbf29 valgrind: ignore leaks from OpenSSL 2012-11-30 15:23:20 +01:00
Carlos Martín Nieto
9ff07c24f5 buf test: make sure we always set the bom variable 2012-11-30 15:17:05 +01:00
Russell Belfer
f684970a10 Merge pull request #1108 from libgit2/ahead-behind-count 
Add API to calculate ahead/behind count
 2012-11-29 22:53:34 -08:00
Scott J. Goldman
1a0c5a34e0 Fixup ahead/behind tests 
Fix a typo that caused a failing test, and use cl_assert_equal
instead of cl_assert.
 2012-11-29 18:11:30 -08:00
Scott J. Goldman
bdf3e6df83 Fix error condition typo 2012-11-29 17:34:41 -08:00
Russell Belfer
d5e44d8498 Fix function name and add real error check 
`revwalk.h:commit_lookup()` -> `git_revwalk__commit_lookup()`
and make `git_commit_list_parse()` do real error checking that
the item in the list is an actual commit object.  Also fixed an
apparent typo in a test name.
 2012-11-29 17:02:27 -08:00
Vicent Martí
f1e5c506b2 Merge pull request #1110 from libgit2/features/push_rebased 
Push! By schu, phkelley, and congyiwu
 2012-11-29 12:18:05 -08:00
Philip Kelley
36c730daa0 Remove more sample hooks from test repo for push 2012-11-29 10:34:16 -05:00
Philip Kelley
3238ee3e07 Remove sample hooks from test repo for push 2012-11-29 08:37:32 -05:00
Philip Kelley
4a6621fdf7 Leverage the min macro from util.h 2012-11-29 08:35:21 -05:00
Philip Kelley
6762fe087b Remove casts of return values of type void * 2012-11-29 08:29:26 -05:00
Philip Kelley
ac22d08f2f Remove git_object_oid2type 2012-11-29 08:22:15 -05:00
Vicent Martí
e2934db2c7 Merge pull request #1090 from arrbee/ignore-invalid-by-default 
Ignore invalid entries by default
 2012-11-29 02:05:46 -08:00
Vicent Martí
ee06fec507 Merge pull request #1083 from nulltoken/fix/tracking 
Fix git_branch_tracking() for branches with empty merge and/or remote config entries
 2012-11-29 01:29:50 -08:00
Vicent Martí
2775d1cb8f Merge pull request #1102 from nulltoken/topic/fetch-test-coverage 
fetch: enhance test coverage
 2012-11-29 01:02:08 -08:00
Vicent Martí
3ae550e36c Merge pull request #1107 from nulltoken/fix/diff-null-tree-against-workdir 
Enhance diff test coverage between a null Tree and the Workdir
 2012-11-29 01:01:44 -08:00
Vicent Martí
e7da560af4 Merge pull request #1088 from arrbee/consolidate-text-functions 
Consolidate text buffer functions
 2012-11-29 00:00:32 -08:00
Scott J. Goldman
b994bfe339 graph.c: prune includes 2012-11-28 18:59:13 -08:00
Scott J. Goldman
0984c8768d Rename git_count_ahead_behind -> git_graph_ahead_behind 
Moved it into graph.{c,h} which i created for the new "graph"
functions namespace. Also adjusted the function prototype
to use `size_t` and `const git_oid *`.
 2012-11-28 18:54:57 -08:00
Scott J. Goldman
c6d03c958f fix coding style: while( -> while ( 2012-11-28 18:54:57 -08:00
Scott J. Goldman
0d9e0323a5 Add the ahead/behind test that Carlos suggested 
Adds a repo with a more complex topology to test the ahead-behind
count.
 2012-11-28 18:54:57 -08:00
Scott J. Goldman
eddde61846 Add tests for ahead-behind count 2012-11-28 18:54:57 -08:00
Scott J. Goldman
bff53e5405 Add initial implementation of ahead-behind count 2012-11-28 18:54:56 -08:00
nulltoken
046a1573ff fetch: enhance test coverage 2012-11-29 00:05:16 +01:00
nulltoken
59a0d772f8 diff: enhance test coverage against the workdir 2012-11-28 20:04:34 +01:00
nulltoken
37849a8ec3 tracking: fix retrieval of the tracking ref of branch with empty merge and/or remote entry 2012-11-28 20:00:07 +01:00
nulltoken
f1bd50d61d tracking: remove code duplication in test 2012-11-28 20:00:06 +01:00