|
230010d1
|
2013-01-15T09:46:50
|
|
Merge pull request #1238 from nulltoken/fix/checkout-index
checkout: Teach checkout to cope with orphaned Head
|
|
|
848d77dc
|
2013-01-14T10:05:35
|
|
Merge pull request #1242 from sba1/init-with-template-fix
Some fixes for external template support
|
|
72719e73
|
2013-01-13T12:21:52
|
|
Altered the description of the template.
Before, it was identical to the default template making it difficult
to check, if the proper template was copied an external template
test.
|
|
|
5885ba11
|
2013-01-13T12:23:30
|
|
Now checks in the template test whether the description file has
been properly copied.
This is a minimal effort to test whether the template really has
been used when creating an repo with external templates.
|
|
5b524d69
|
2013-01-12T19:37:14
|
|
Fix Travis compilation warnings
|
|
|
2a3b3e03
|
2013-01-12T19:27:31
|
|
checkout: Teach checkout to cope with orphaned Head
Fix #1236
|
|
0b3aa7be
|
2013-01-12T19:01:45
|
|
tests: plug leaks
|
|
|
4a4aee11
|
2013-01-12T18:44:50
|
|
Added flag GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE to test_repo_init__extended_with_template().
Otherwise the template functionallity is not tested (as a TODO we
also shall test that the specified template really got copied).
|
|
e2d2c6e5
|
2013-01-12T02:14:14
|
|
Merge pull request #1222 from scunz/clone_branch
Switch to specified branch during clone
|
|
359316b5
|
2013-01-11T17:16:55
|
|
Merge pull request #1215 from phkelley/binaryunicode
Add a failing test for CRLF filters
|
|
|
dd6367e3
|
2013-01-11T19:00:19
|
|
Fix up binaryunicode test repo
|
|
f1d4a35e
|
2013-01-12T00:08:48
|
|
Tests: Add test for check out of given branch during clone
|
|
|
b5b28120
|
2013-01-12T00:07:44
|
|
Test: Cleanup some cleaning code
|
|
|
160e4fb7
|
2013-01-11T11:35:09
|
|
Merge pull request #1230 from arrbee/match-core-git-diff-binary-detection
Match binary file check of core git in diff
|
|
|
6e19edaa
|
2013-01-11T11:34:13
|
|
Merge pull request #1229 from arrbee/fix-diff-patch-line-numbers
Fix diff patch line number calculation
|
|
|
0d65acad
|
2013-01-11T11:24:26
|
|
Match binary file check of core git in diff
Core git just looks for NUL bytes in files when deciding about
is-binary inside diff (although it uses a better algorithm in
checkout, when deciding if CRLF conversion should be done).
Libgit2 was using the better algorithm in both places, but that
is causing some confusion. For now, this makes diff just look
for NUL bytes to decide if a file is binary by content in diff.
|
|
|
805c476c
|
2013-01-11T11:20:44
|
|
Fix diff patch line number calculation
This was just wrong. Added a test that verifying patch line
numbers even for hunks further into a file and then fixed the
algorithm. I needed to add a little extra state into the patch
so that I could track old and new file numbers independently,
but it should be okay.
|
|
|
f3738eba
|
2013-01-11T15:39:14
|
|
Fix MSVC Clar compilation warnings
|
|
|
090d5e1f
|
2013-01-11T14:40:09
|
|
Fix MSVC compilation warnings
|
|
|
4a0ac175
|
2013-01-10T23:27:13
|
|
checkout: Deploy EMERGECONFLICT usage
|
|
|
cce2f16b
|
2013-01-10T12:32:20
|
|
Fix indentations
|
|
|
2086e1ba
|
2013-01-11T16:54:57
|
|
tests: plug a couple of leaks
|
|
|
40342bd2
|
2013-01-10T15:15:37
|
|
Add GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH
This adds an option to checkout a la the diff option to turn off
fnmatch evaluation for pathspec entries. This can be useful to
make sure your "pattern" in really interpretted as an exact file
match only.
|
|
|
404880b1
|
2013-01-10T11:24:09
|
|
Merge pull request #1206 from ben/stock-auth
Expose stock user/pass credential utility
|
|
eb3c247a
|
2013-01-10T11:56:02
|
|
REUC needs to handle empty sides
|
|
520dcc1c
|
2013-01-08T19:55:59
|
|
Move credential helpers to their own (optional) header
|
|
|
ffb02b16
|
2013-01-08T12:58:20
|
|
Expose stock user/pass credential utility
|
|
|
fcc48d1f
|
2013-01-09T12:37:22
|
|
Add a failing test for autocrlf filters
|
|
abeefbbe
|
2012-12-26T19:16:23
|
|
push: properly handle tags
Currently, push doesn't really handle tags when queueing objects. Fix
it.
|
|
|
f85b6284
|
2012-12-25T14:50:29
|
|
tests-clar/network: remove unused CREATE_BLOB
|
|
087f64d3
|
2012-12-17T18:48:26
|
|
Relax refspecs accepted by push
|
|
|
de590550
|
2013-01-08T17:11:11
|
|
Resolve crash with diff against empty file
It is not legal inside our `p_mmap` function to mmap a zero length
file. This adds a test that exercises that case inside diff and
fixes the code path where we would try to do that.
The fix turns out not to be a lot of code since our default file
content is already initialized to "" which works in this case.
Fixes #1210
|
|
|
f2b7f7a6
|
2013-01-07T15:44:22
|
|
Share git_diff_blobs/git_diff_blob_to_buffer code
This moves the implementation of these two APIs into common code
that will be shared between the two. Also, this adds tests for
the `git_diff_blob_to_buffer` API. Lastly, this adds some extra
`const` to a few places that can use it.
|
|
c31ae146
|
2013-01-06T18:38:29
|
|
merge cleanup should actually cleanup and the test should actually test
|
|
|
74f880a6
|
2013-01-06T07:56:08
|
|
Merge pull request #1197 from nulltoken/travis/run-online-tests
travis: Include the online suite when running against Travis
|
|
|
b97fabfa
|
2013-01-06T15:18:00
|
|
tests: Fix some memory leaks
|
|
|
d74b1bc5
|
2013-01-05T15:44:19
|
|
Merge pull request #1131 from libgit2/correct-ahead-behind
Fix an issue with ahead-behind for lopsided traversal
|
|
|
2f089539
|
2013-01-04T17:17:37
|
|
Actually fix win32 checkout test
It turns out that using REMOVE_UNTRACKED with checkout for this
particular test was causing the .gitattributes file to be removed
and so we do have to allow for the CRs in the created file...
|
|
|
bebdbcd4
|
2013-01-04T16:56:21
|
|
Fix crlf issue with checkout tests
Move some checkout utility functions into a shared file and fix
some crlf filtering issues when verifying file contents.
|
|
|
817d6251
|
2013-01-03T16:56:27
|
|
Fix checkout of index-only dirs and prefixed paths
There are a couple of checkout bugs fixed here. One is with
untracked working directory entries that are prefixes of tree
entries but not in a meaningful way (i.e. "read" is a prefix of
"readme.txt" but doesn't interfere in any way). The second bug
is actually a redo of 07edfa0fc640f85f95507c3101e77accd7d2bf0d
where directory entries in the index that are not in the diff
were not being removed correctly. That fix remedied one case
but broke another.
|
|
|
7fc00435
|
2013-01-03T15:48:52
|
|
Add index API to remove all files in a directory
This adds the git_index_remove_directory API plus tests.
|
|
|
d8889d2b
|
2013-01-03T14:08:53
|
|
Fix checkout bug rmv untracked trees from index
When checking out with the GIT_CHECKOUT_REMOVE_UNTRACKED option
and there was an entire tree in the working directory and in the
index that is not in the baseline nor target commit, the tree was
correctly(?) removed from the working directory but was not
successfully removed from the index. This fixes that and adds a
test of the functionality.
|
|
|
0d70f650
|
2013-01-03T10:51:18
|
|
Fixing checkout UPDATE_ONLY and adding tests
This adds a bunch of new checkout tests and in the process I found
a bug in the GIT_CHECKOUT_UPDATE_ONLY flag which I fixed.
|
|
|
b3fb9237
|
2013-01-02T17:12:45
|
|
Clone should use GIT_CHECKOUT_SAFE_CREATE
For clone to work as expected, it should be using a SAFE_CREATE
checkout (i.e. create files that are missing, even if the target
tree matches the current HEAD).
|
|
|
c50c58de
|
2013-01-02T17:10:56
|
|
Extend tests for checkout with typechanges
Test a number of other cases, including intentionally forced
conflicts and deeper inspection that trees get created properly.
There is a still a bug in checkout because the first test here
(i.e. test_checkout_typechange__checkout_typechanges_safe) should
be able to pass with GIT_CHECKOUT_SAFE as a strategy, but it will
not because of some lingering submodule checkout issues.
|
|
|
a6a82e1a
|
2012-12-19T15:06:40
|
|
Improve error propagation in stash
Stash was sometimes obscuring the actual error code, replacing it
with a -1 when there was more descriptive value. This updates
stash to preserve the original error code more reliably along
with a variety of other error handling tweaks.
I believe this is an improvement, but arguably, preserving the
underlying error code may result in values that are harder to
interpret by the caller who does not understand the internals.
Discussion is welcome!
|
|
|
8fe713cc
|
2012-12-19T15:06:14
|
|
Make git_oid_tostr use out buffer for NULL oid
Previously a NULL oid was handled like an empty buffer and
returned a status empty string. This makes git_oid_tostr()
set the output buffer to the empty string instead.
|
|
|
5cf9875a
|
2012-12-18T15:19:24
|
|
Add index updating to checkout
Make checkout update entries in the index for all files that are
updated and/or removed, unless flag GIT_CHECKOUT_DONT_UPDATE_INDEX
is given. To do this, iterators were extended to allow a little
more introspection into the index being iterated over, etc.
|
|
|
7e5c8a5b
|
2012-12-10T15:31:43
|
|
More checkout improvements
This flips checkout back to be driven off the changes between
the baseline and the target trees. This reinstates the complex
code for tracking the contents of the working directory, but
overall, I think the resulting logic is easier to follow.
|
|
|
cf208031
|
2012-12-06T13:36:17
|
|
Rework checkout internals (again)
I've tried to map out the detailed behaviors of checkout and make
sure that we're handling the various cases correctly, along with
providing options to allow us to emulate "git checkout" and "git
checkout-index" with the various flags. I've thrown away flags
in the checkout API that seemed like clutter and added some new
ones. Also, I've converted the conflict callback to a general
notification callback so we can emulate "git checkout" output and
display "dirty" files.
As of this commit, the new behavior is not working 100% but some
of that is probably baked into tests that are not testing the
right thing. This is a decent snapshot point, I think, along the
way to getting the update done.
|
|
|
c5df10f4
|
2012-11-30T10:59:03
|
|
Failing test on git_checkout_tree when removing directories
|
|
d0951175
|
2012-12-06T16:12:21
|
|
Add failing test to demonstrate wrong checkout behaviour
|
|
|
e9e20c84
|
2012-12-19T14:52:12
|
|
Update cl_git_pass to return more info
This adds a failure reporting function that is called by
cl_git_pass which captures the actual error return code and
the error message if available in the failure report.
|
|
60406162
|
2013-01-04T20:28:33
|
|
clar: lolpython
|
|
|
3a4a961d
|
2013-01-04T20:25:10
|
|
clar: Corrupted pickles
|
|
|
c18a5ec5
|
2013-01-04T11:10:39
|
|
Merge pull request #1174 from nulltoken/topic/soft_reset_with_index_conflicts
Prevent soft reset when index contains conflicts
|
|
702c3bf7
|
2013-01-04T19:01:36
|
|
clar: make it compatible with python3
|
|
|
1d5d4186
|
2013-01-04T20:02:01
|
|
clar: haha
|
|
|
73b58c91
|
2013-01-04T20:00:09
|
|
clar: fix warning on Windows
|
|
|
9a0d5904
|
2012-12-27T13:42:27
|
|
reset: Cannot soft reset with a conflicted index
|
|
|
52ee071b
|
2013-01-04T09:33:54
|
|
Merge pull request #1189 from martinwoodward/tests-compliance
Add jGit license block to derrived tests
|
|
ba1a430a
|
2013-01-04T17:29:45
|
|
Add jGit license block to derrived tests
Add the jGit license block to tests derrived from jGit as per the
terms of the BSD license.
|
|
|
a7ffd936
|
2013-01-04T17:46:38
|
|
clar: fix merge/setup.c
|
|
|
5a62d659
|
2013-01-03T12:44:09
|
|
MERGE_HEAD contents iterator
|
|
d73d52df
|
2013-01-03T13:26:11
|
|
Fix bug in gen_pktline() for deletes of missing remote refs
* gen_pktline() in smart_protocol.c was skipping refspecs that deleted
refs that were not advertised by the server. The new behavior is to
send a delete command with an old-id of zero, which matches the behavior
of the official git client.
* Update test_network_push__delete() in reaction to above fix.
* Obviate messy logic that handles missing push_spec rrefs by canonicalizing
push_spec. After calculate_work(), loid, roid, and rref, are filled in with
exactly what is sent to the server
|
|
b60b4562
|
2013-01-03T16:31:36
|
|
add option to allow git note overwrite
|
|
|
686a243a
|
2013-01-04T08:36:13
|
|
Merge pull request #1184 from ethomson/mergehead_iterator
MERGE_HEAD contents iterator
|
|
|
42e50b5e
|
2013-01-03T12:44:09
|
|
MERGE_HEAD contents iterator
|
|
|
4128f5aa
|
2013-01-03T13:26:11
|
|
Fix bug in gen_pktline() for deletes of missing remote refs
* gen_pktline() in smart_protocol.c was skipping refspecs that deleted
refs that were not advertised by the server. The new behavior is to
send a delete command with an old-id of zero, which matches the behavior
of the official git client.
* Update test_network_push__delete() in reaction to above fix.
* Obviate messy logic that handles missing push_spec rrefs by canonicalizing
push_spec. After calculate_work(), loid, roid, and rref, are filled in with
exactly what is sent to the server
|
|
|
b8a1ea7c
|
2013-01-03T11:04:03
|
|
Fix core::env cleanup code
Mark fake home directories that failed to be created, so we won't
try to remove them and have cleanup just use p_rmdir.
|
|
|
54254a0f
|
2013-01-03T19:38:29
|
|
Status tests...
|
|
|
7b51d675
|
2013-01-03T19:17:07
|
|
Even more cleanups
|
|
|
f6fded8f
|
2013-01-03T19:07:41
|
|
Proper cleanup jeez
|
|
|
600d8dbf
|
2013-01-03T09:10:38
|
|
Move test cleanup into cleanup functions
|
|
|
bffbeebb
|
2013-01-03T08:38:00
|
|
Cleanup after tests
|
|
|
6fef1ab3
|
2013-01-03T07:47:51
|
|
Tests should clean up after themselves
|
|
|
8716b499
|
2013-01-03T16:31:36
|
|
add option to allow git note overwrite
|
|
|
7761ce21
|
2013-01-03T04:24:12
|
|
Merge branch 'development' into clar2
Conflicts:
tests-clar/clone/nonetwork.c
tests-clar/online/clone.c
tests-clar/online/fetchhead.c
|
|
|
2e6f06a8
|
2013-01-03T02:34:45
|
|
...and add Clar raw
|
|
|
8ee7174b
|
2013-01-03T02:22:42
|
|
Remove the clar submodule
|
|
|
f46769e5
|
2013-01-03T02:13:37
|
|
Fix network suite
|
|
|
6443eaf2
|
2013-01-03T00:50:29
|
|
Disable Network suite by default
|
|
|
922dd978
|
2013-01-02T13:54:37
|
|
Move some clone tests to the nonetwork suite
|
|
|
cd5ca5b9
|
2013-01-02T13:50:41
|
|
Merge pull request #1152 from ben/clone-api-structification
Segregate in-memory and persisted remotes
|
|
|
730df6d0
|
2013-01-02T13:43:54
|
|
Include checkout options inline
|
|
|
39cd0177
|
2013-01-02T22:38:10
|
|
This is a better name
|
|
|
0642c143
|
2013-01-02T12:44:47
|
|
Move `url` to last place in parameter list
|
|
|
5c2d3f6d
|
2013-01-02T04:17:31
|
|
Add build dependency for clar. Also, fuck you CMake. Fuck you.
|
|
|
b0a45829
|
2012-12-19T01:10:13
|
|
Bump the Clar submodule
|
|
|
156cfec0
|
2012-12-19T00:12:26
|
|
Cleanup Clar to make it SIMPLER
|
|
|
50a762a5
|
2012-12-26T12:03:07
|
|
path: Teach UNC paths to git_path_dirname_r()
Fix libgit2/libgit2sharp#256
|
|
|
34b6f05f
|
2012-12-26T11:59:07
|
|
path: enhance git_path_dirname_r() test coverage
|
|
|
19c3c99c
|
2012-12-24T17:16:41
|
|
remote: remove duplicated test
|
|
|
f19304d2
|
2012-12-24T15:59:01
|
|
remote: Prevent create() from blindly overwriting
|
|
|
b0aa14aa
|
2012-12-24T15:27:42
|
|
remote: Enhance in-memory remote test coverage
|
|
|
6bd09ecc
|
2012-12-24T15:51:10
|
|
Fix MSSVC compilation issue
|
|
|
2808ec9a
|
2012-12-21T13:15:37
|
|
Rename test to make @nulltoken happy
|
|
|
79000951
|
2012-12-21T08:05:59
|
|
In-memory remotes don't have names
|
|
|
874dcb25
|
2012-12-20T11:49:05
|
|
Remote: deprecate dangling, prevent saving in-memory
|
|
|
29f27599
|
2012-12-20T10:51:09
|
|
Rename remote creation APIs
git_remote_add -> git_remote_create
git_remote_new -> git_remote_create_inmemory
|