Ben Straub
0de2c4e3a3
Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuff
2014-02-05 13:15:57 -08:00
Ben Straub
629ba7f105
Merge pull request #2027 from libgit2/rb/only-windows-is-windows
...
Some tests of paths that can't actually be written to disk
2014-02-05 13:07:46 -08:00
Carlos Martín Nieto
d18209eef9
revwalk: add a test for pushing all references
...
This used to be broken, let's make sure we don't break this use-case.
2014-02-05 12:16:44 +01:00
Carlos Martín Nieto
d465e4e980
revwalk: ignore wrong object type in glob pushes
...
Pushing a whole namespace can cause us to attempt to push non-committish
objects. Catch this situation and special-case it for ignoring this.
2014-02-05 12:16:44 +01:00
Carlos Martín Nieto
b4ef67d5eb
revwalk: add a failing test for pushing "tags"
...
This shows that pusing a whole namespace can be problematic.
2014-02-05 12:16:37 +01:00
Ben Straub
010cec3ac2
Add reflog params to git_repository_detach_head
2014-02-04 20:50:40 -08:00
Ben Straub
c3ab1e5af4
Add reflog parameters to remote apis
...
Also added a test for git_remote_fetch.
2014-02-04 20:38:13 -08:00
Ben Straub
491cecfe8c
Add reflog parameters to git_push_update_tips
2014-02-04 20:27:44 -08:00
Ben Straub
0adb06065b
Fix reflog message when creating commits
2014-02-04 15:32:57 -08:00
Edward Thomson
bb13d39162
Test that emulates a strange filter implementation
2014-02-03 19:56:34 -08:00
Edward Thomson
16eb8b7c06
Tests merging staged files identical to result
2014-02-03 19:56:34 -08:00
Edward Thomson
b60149eced
Tests merge when changes exist in workdir/index
2014-02-03 19:56:33 -08:00
Ben Straub
86746b4b3a
Add reset tests for reflog
2014-02-03 15:06:47 -08:00
Ben Straub
eec2761f06
Fix warning
2014-02-03 15:06:32 -08:00
Ben Straub
586be3b889
Add reflog parameters to git_reset
2014-02-03 15:05:55 -08:00
Ben Straub
0d847a3159
Reset helpers: use revparse instead
2014-02-03 14:08:40 -08:00
Vicent Marti
3b6a5bac20
Merge pull request #2095 from libgit2/update-head-reflog
...
Correct "new" id for reattached-HEAD reflog entry
2014-02-03 10:36:04 -08:00
Arthur Schreiber
50ad7cc208
Add git_reference_is_note.
2014-02-02 18:20:38 +01:00
Ben Straub
7ac1b89942
Add failing test case
2014-02-01 11:46:15 -08:00
Russell Belfer
7be88b4c4d
Update to latest clar
2014-01-31 13:44:09 -08:00
Ben Straub
db092c1955
Allow tests to run without user config
2014-01-30 16:10:18 -08:00
Ben Straub
a1710a28f6
Enhance testing of signature parameters
2014-01-30 15:53:52 -08:00
Ben Straub
59bb1126e0
Provide good default reflog messages in branch api
2014-01-30 15:53:52 -08:00
Ben Straub
e871d89b28
Ensure moving a branch updates the reflog
2014-01-30 15:52:14 -08:00
Ben Straub
ccf6ce5c89
Ensure renaming a reference updates the reflog
2014-01-30 15:52:13 -08:00
Ben Straub
540c1809f4
Add reflog parameters to git_branch_move
2014-01-30 15:52:13 -08:00
Ben Straub
48110f67e4
Deleting a branch deletes its reflog
2014-01-30 15:52:13 -08:00
Ben Straub
1cc974ab62
Augment clone API with reflog parameters
2014-01-30 15:52:13 -08:00
Ben Straub
b31ebfbc66
Add reflog params to git_branch_create
2014-01-30 15:52:13 -08:00
Ben Straub
67c4716f74
Add passing reflog tests
2014-01-30 15:51:00 -08:00
Ben Straub
2952a9d0f4
Ensure creating HEAD creates its reflog
2014-01-30 15:51:00 -08:00
Ben Straub
a2311f92c2
Ensure updating HEAD updates reflog
2014-01-30 15:51:00 -08:00
Ben Straub
94f263f59b
Add reflog params to set-head calls
2014-01-30 15:51:00 -08:00
Vicent Marti
8646b0a068
Merge pull request #2085 from libgit2/rb/index-tree-blob-collision
...
Index tree-bob collision
2014-01-30 15:10:39 -08:00
Russell Belfer
8606f33bea
Expand zstream tests and fix off-by-one error
2014-01-30 10:00:00 -08:00
Russell Belfer
d9b04d78a3
Reorganize zstream API and fix wrap problems
...
There were some confusing issues mixing up the number of bytes
written to the zstream output buffer with the number of bytes
consumed from the zstream input. This reorganizes the zstream
API and makes it easier to deflate an arbitrarily large input
while still using a fixed size output.
2014-01-30 09:59:59 -08:00
Russell Belfer
3cf11eef17
Misc cleanups
2014-01-30 09:59:59 -08:00
Russell Belfer
c0644c3fbb
Make submodule fetchRecurse match other options
...
This removes the fetchRecurse compiler warnings and makes the
behavior match the other submodule options (i.e. the in-memory
setting can be reset to the on-disk value).
2014-01-30 09:59:59 -08:00
Edward Thomson
bae8bea051
More index collision tests
2014-01-29 13:15:53 -08:00
Russell Belfer
95fbedcd8e
Add test for blob/tree name collisions in index
2014-01-29 13:15:50 -08:00
Edward Thomson
96f12e709b
Don't strcmp a git_buf, strcmp its char *
2014-01-29 12:50:42 -08:00
Arthur Schreiber
e7c16943f4
Add git_graph_descendant_of.
2014-01-28 19:39:14 +01:00
Vicent Marti
a1a9d0bd48
Merge pull request #2066 from libgit2/rb/builtin-diff-drivers
...
Add built in diff drivers
2014-01-27 15:35:39 -08:00
Russell Belfer
daebb59869
Add PHP tests and fix bug in PHP builtin driver
2014-01-27 14:57:03 -08:00
Russell Belfer
082e82dba5
Update Javascript userdiff driver and tests
...
Writing a sample Javascript driver pointed out some extra
whitespace handling that needed to be done in the diff driver.
This adds some tests with some sample javascript code that I
pulled off of GitHub just to see what would happen. Also, to
clean up the userdiff test data, I did a "git gc" and packed
up the test objects.
2014-01-27 11:45:06 -08:00
Vicent Marti
93954245e0
Merge pull request #2075 from libgit2/cmn/leftover-oid
...
Leftover OID -> ID changes
2014-01-27 09:39:36 -08:00
Vicent Marti
46e7fc1853
Merge pull request #2077 from libgit2/cmn/buf-out
...
Buff up returning strings
2014-01-27 09:36:24 -08:00
Carlos Martín Nieto
66d585c6b3
MSVC doesn't like modern code
2014-01-27 04:58:23 +01:00
Carlos Martín Nieto
bf522e0811
refspec: move to git_buf for outputting strings
2014-01-27 04:44:06 +01:00
Carlos Martín Nieto
e1d7f0035e
messsage: use git_buf in prettify()
...
A lot of the tests were checking for overflow, which we don't have
anymore, so we can remove them.
2014-01-27 04:44:06 +01:00
