Commit Graph

4865 Commits

Author SHA1 Message Date
Carlos Martín Nieto
f90391ea5f treebuilder: don't overwrite the error message 2013-04-18 14:48:40 +02:00
Nicolas Viennot
9e46f67618 Return error for empty name/email 2013-04-18 00:56:42 -04:00
Vicent Martí
53cb87575d Merge pull request #1478 from ethomson/win32_typechange_test
use a longer string for dummy data in test to avoid conflicting w/ index
2013-04-17 15:27:53 -07:00
Edward Thomson
8023b83a94 use a longer string for dummy data in test to avoid conflicting w/ index 2013-04-17 17:21:17 -05:00
Vicent Marti
437d36662e repository: Doc fix 2013-04-18 00:15:29 +02:00
Vicent Martí
0d9bf89083 Merge pull request #1475 from libgit2/vmg/refs-peel
Allow access to the cached peel data in packed-refs
2013-04-17 14:59:28 -07:00
Vicent Marti
fedd0f9e90 refs: Do not union the peel 2013-04-17 23:29:34 +02:00
Vicent Marti
13421eee1a refs: Check alloc is cleaner 2013-04-17 22:32:39 +02:00
Vicent Martí
526882a30a Merge pull request #1477 from ethomson/checkout_modified_use_cache
checkout: use cache when possible to determine if workdir item is dirty
2013-04-17 12:20:09 -07:00
Vicent Martí
f9fe1b6ea3 Merge pull request #1476 from libgit2/vmg/bare-open
Add `git_repository_open_bare`
2013-04-17 12:19:44 -07:00
Edward Thomson
0da62c5cf0 checkout: use cache when possible to determine if workdir item is dirty
If the on-disk file has been staged (it's stat data matches the stat data
in the cache) then we need not hash the file to determine whether it
differs from the checkout target; instead we can simply use the oid in
the index.

This prevents recomputing a file's hash unnecessarily, prevents loading
the file (when filtering) and prevents edge cases where filters suggest
that a file is dirty immediately after git writes the file.
2013-04-17 10:52:49 -05:00
Vicent Marti
3be933b143 refs: Add git_referene_target_peel 2013-04-17 17:33:51 +02:00
Vicent Martí
1f327768c7 Merge pull request #1474 from ghedo/development
Update link to Perl bindings
2013-04-17 05:39:54 -07:00
Alessandro Ghedini
1cfaaa9e48 Update link to Perl bindings 2013-04-17 13:48:26 +02:00
Carlos Martín Nieto
6edad4d8a4 Add mailmap entries for me 2013-04-17 11:03:18 +02:00
Vicent Marti
a442ed687d repository: Add git_repository_open_bare 2013-04-17 04:46:37 +02:00
Ben Straub
5d7c940b07 /mailmap me 2013-04-16 13:25:38 -07:00
Vicent Marti
a50086d174 Merge branch 'development' 2013-04-16 17:46:41 +02:00
Vicent Marti
f124ebd457 libgit2 0.18.0 "Big Ben"
This is the last minor release before 1.0preview1.

Highlights of this release include:

- Branch API
- Checkout head, index and tree
- Finished clone support
- Abstracted reference API to use custom backends
- Full diff support
- New (faster) packbuilder
- Push support
- New Remotes API
- Revparse support (single and range commits)
- Stash support
- Submodules support

As always, the full changelog is available at:

	http://libgit2.github.com/libgit2/#p/changelog

Yeah, it's a huge release. Releasing stuff sucks.
Expect 1.0 and API freeze in less than a month.

Your faithful maintainer,
	 vmg

Signed-off-by: Vicent Marti <tanoku@gmail.com>
2013-04-16 17:45:12 +02:00
Vicent Martí
24f61bc53a Merge pull request #1469 from libgit2/vmg/unified-revision
Unified rev-parse, with a revision object
2013-04-15 15:47:38 -07:00
Vicent Martí
54e0548234 Merge pull request #1470 from carlosmn/remote-ls-after-close
Fetch fixes
2013-04-15 15:27:27 -07:00
Vicent Marti
32ef1d1c7c Fix examples 2013-04-16 00:17:40 +02:00
Carlos Martín Nieto
404eadb089 remote: don't try to update FETCH_HEAD if no extra heads exist
Don't try to update anything if there are no heads to update. This
saves us from trying to look into a fetch refspec when there is none.

A better fix for compatibility with git when using remotes without
refspecs is still needed, but this stops us from segfaulting.
2013-04-16 00:11:59 +02:00
Vicent Marti
e13a0647a0 Update docs 2013-04-15 23:54:28 +02:00
Vicent Marti
cbda09d00b git_revision -> git_revspec 2013-04-15 23:40:46 +02:00
Vicent Marti
36c2dfed69 Is this crazy? 2013-04-15 23:32:40 +02:00
Carlos Martín Nieto
67ba7d2031 Allow git_remote_ls after disconnecting from the remote
Keep the data around until free, as expected by our own fetch example
2013-04-15 23:22:32 +02:00
Vicent Marti
d064c74794 Merge remote-tracking branch 'ben/unified-revparse' into development 2013-04-15 23:18:24 +02:00
Ben Straub
201566539f Clean up minor details 2013-04-15 13:29:40 -07:00
Ben Straub
5961d5ea7f Clean up example code. 2013-04-15 12:10:18 -07:00
Ben Straub
299a224be1 Change git_revparse to output git_object pointers
This will probably prevent many lookup/free
operations in calling code.
2013-04-15 12:00:04 -07:00
Ben Straub
2ebc3c66c2 Redeploy git_revparse_single. 2013-04-15 11:57:24 -07:00
Ben Straub
4291ad0781 Reintroduce git_revparse_single. 2013-04-15 11:42:34 -07:00
Vicent Martí
77849ebf1e Merge pull request #1468 from carlosmn/obsd-sparc64
OpenBSD & sparc64 fixes
2013-04-15 11:19:12 -07:00
Carlos Martín Nieto
4a3f69b5b2 refdb tests: use the right variable size
Mixing int and size_t through pointers leads to problems
in big-endian machines.
2013-04-15 20:20:14 +02:00
Carlos Martín Nieto
872ca1d302 Fix compilation on OpenBSD 2013-04-15 20:00:42 +02:00
Vicent Martí
2d2260da41 Merge pull request #1467 from carlosmn/commit-parse
commit: correctly detect the start of the commit message
2013-04-15 06:11:29 -07:00
Carlos Martín Nieto
0efae3b22e commit: correctly detect the start of the commit message
The end of the header is signaled by to consecutive LFs and the commit
message starts immediately after. Jumping over LFs at the start of the
message is a bug and leads to creating different commits if
when rebuilding history.

This also fixes an empty commit message being returned as "\n".
2013-04-15 12:24:08 +02:00
Russell Belfer
041ed367ab Merge pull request #1464 from ethomson/refdb_free
dec refcount on refdb instead of always freeing
2013-04-12 10:48:23 -07:00
Edward Thomson
7ebc249c22 dec refcount on refdb instead of always freeing 2013-04-12 11:21:47 -05:00
Vicent Martí
ea8bac37b0 Merge pull request #1450 from carlosmn/branch-upstream
Branch upstream configuration
2013-04-11 06:34:59 -07:00
Carlos Martín Nieto
d59942c2ab branch: add more upstream configuration management
Add functions to set and unset the upstream configuration to
complement the getter we already have.
2013-04-11 12:27:25 +02:00
Vicent Martí
acd4077182 Merge pull request #1367 from yorah/fix/pathspecs_behaviour
Correctly return matched pathspec when passing "*" or "."
2013-04-11 03:03:02 -07:00
yorah
0d32f39eb8 Notify '*' pathspec correctly when diffing
I also moved all tests related to notifying in their own file.
2013-04-11 09:59:26 +02:00
Vicent Marti
575a54db85 object: Export git_object_dup 2013-04-10 16:56:32 +02:00
Vicent Martí
90431f1b80 Merge pull request #1424 from phkelley/efficient_push
Reduce the number of unnecessary objects in pushed packs
2013-04-10 08:33:33 -07:00
Vicent Marti
0d3ccf0b28 examples: Don't print weird characters 2013-04-10 16:41:05 +02:00
Vicent Martí
e9b7ff602b Merge pull request #1460 from arrbee/fix-dirty-submodules-diff
Submodule diff tests and fixes
2013-04-09 15:15:18 -07:00
Russell Belfer
ad26434b3b Tests and more fixes for submodule diffs
This adds tests for diffs with submodules in them and (perhaps
unsurprisingly) requires further fixes to be made.  Specifically,
this fixes:

- when considering if a submodule is dirty in the workdir, it was
  being treated as dirty even if only the index was dirty.
- git_diff_patch_to_str (and git_diff_patch_print) were "printing"
  the headers for files (and submodules) that were unmodified or
  had no meaningful content.
- added comment to previous fix and removed unneeded parens.
2013-04-09 14:52:32 -07:00
Russell Belfer
9da187e83d Fix clang warnings and improve checks 2013-04-09 11:40:00 -07:00