Ben Straub
0d8265c8af
Staticize file-local variables
2014-02-24 05:32:05 -08:00
Russell Belfer
72556cc63b
Address PR comments
...
* Make GIT_INLINE an internal definition so it cannot be used in
public headers
* Fix language in CONTRIBUTING
* Make index caps API use signed instead of unsigned values
2014-02-20 14:27:10 -08:00
Ben Straub
9bda5fb8c1
Improve error propagation in shallow call
2014-02-18 14:05:30 -08:00
Edward Thomson
2a528bc088
Fix filter test for CRLF->LF issues
2014-02-11 19:05:52 -06:00
Russell Belfer
5d195cf76b
Merge pull request #2110 from libgit2/ed/crlf_input
...
Handle `core.autocrlf=input` when checking out
2014-02-11 15:56:04 -08:00
Carlos Martín Nieto
15284a2c5a
refs: move current_id before the reflog parameters
...
Keep the reflog parameters as the last two, as they're the optional
parameters.
2014-02-10 14:52:28 +01:00
Edward Thomson
9780020b18
Tests for crlf filtering into the repository
2014-02-09 13:45:39 -08:00
Edward Thomson
f77127da12
Tests for core.autocrlf and .gitattributes
2014-02-09 13:45:38 -08:00
Edward Thomson
fb6f4539d1
Close files on file diff failure
...
Not closing the files on a diff failure ensures that clar
cleanup will fail on win32 because we still have the file open.
2014-02-09 13:45:36 -08:00
Russell Belfer
80c29fe93e
Add git_commit_amend API
...
This adds an API to amend an existing commit, basically a shorthand
for creating a new commit filling in missing parameters from the
values of an existing commit. As part of this, I also added a new
"sys" API to create a commit using a callback to get the parents.
This allowed me to rewrite all the other commit creation APIs so
that temporary allocations are no longer needed.
2014-02-07 16:17:59 -08:00
Russell Belfer
2d9291943c
Merge pull request #2099 from libgit2/bs/more-reflog-stuff
...
More reflogness
2014-02-07 16:14:17 -08:00
Russell Belfer
57c47af107
Merge pull request #2042 from libgit2/cmn/conditional-ref
...
refs: conditional ref updates
2014-02-07 16:05:19 -08:00
Russell Belfer
3158e2febe
Fix some Windows warnings
...
This fixes a number of warnings with the Windows 64-bit build
including a test failure in test_repo_message__message where an
invalid pointer to a git_buf was being used.
2014-02-07 15:43:37 -08:00
Vicent Marti
c4ee3b54f8
Merge pull request #2100 from libgit2/rb/update-pqueue
...
Replace priority queue code with implementation from hashsig
2014-02-07 18:32:06 +01:00
Ben Straub
db55bb73ff
Correct default reflog message for git_remote_fetch
2014-02-06 11:18:10 -08:00
Ben Straub
5dae3ffe25
Only run clone-failure test on private repo
2014-02-05 19:27:27 -08:00
Ben Straub
78ee7e81f5
More merge.conflictstyle fixes
2014-02-05 14:10:19 -08:00
Ben Straub
3094102f69
Avoid crash when skipping remote test
2014-02-05 14:05:18 -08:00
Ben Straub
fe45922d77
Fix broken clone test
2014-02-05 13:41:12 -08:00
Ben Straub
a2ce19ca68
Prevent user's merge.conflictstyle from breaking tests
2014-02-05 13:35:26 -08:00
Ben Straub
5c8be32559
Fix a few references to changed function signatures
2014-02-05 13:32:45 -08:00
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
Carlos Martín Nieto
5367ec4b84
refs: add an unconditional delete
...
Add it under the git_reference_remove() name, letting the user pass the
repo and name, analogous to unconditional setting/creation.
2014-02-05 12:07:57 +01:00
Carlos Martín Nieto
b7ae71ecf2
refs: catch cases where the ref type has changed
...
If the type of the on-disk reference has changed, the old value
comparison should fail.
2014-02-05 12:07:57 +01:00
Carlos Martín Nieto
f44fd59ed7
refs: check the ref's old value when deleting
...
Recognize when the reference has changed since we loaded it.
2014-02-05 12:07:57 +01:00
Carlos Martín Nieto
878fb66f57
refs: bring conditional symbolic updates to the frontend
...
Bring the race detection goodness to symbolic references as well.
2014-02-05 12:07:57 +01:00
Carlos Martín Nieto
d6236cf662
refs: add tests for conditional updates
2014-02-05 12:07:56 +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
Russell Belfer
43709ca878
Fix typo setting sorted flag when reloading index
...
This fixes a typo I made for setting the sorted flag on the index
after a reload. That typo didn't actually cause any test failures
so I'm also adding a test that explicitly checks that the index is
correctly sorted after a reload when ignoring case and when not.
2014-02-04 10:33:30 -08:00
Russell Belfer
882c774271
Convert pqueue to just be a git_vector
...
This updates the git_pqueue to simply be a set of specialized
init/insert/pop functions on a git_vector.
To preserve the pqueue feature of having a fixed size heap, I
converted the "sorted" field in git_vectors to a more general
"flags" field so that pqueue could mix in it's own flag. This
had a bunch of ramifications because a number of places were
directly looking at the vector "sorted" field - I added a couple
new git_vector helpers (is_sorted, set_sorted) so the specific
representation of this information could be abstracted.
2014-02-04 10:01:37 -08:00
Russell Belfer
af4bc6615d
Add some priority queue tests
...
I forgot that I wrote some tests for the new priority queue code.
2014-02-03 21:04:40 -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