|
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.
|
|
|
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.
|
|
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
|
|
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
|
|
|
621b50e4
|
2012-12-19T16:51:37
|
|
Clone: trust but verify
|
|
|
b412d563
|
2012-12-18T19:46:05
|
|
Add more clone options. Push test suite segfaults.
|
|
7fcec834
|
2012-12-11T22:31:21
|
|
fetchhead reading/iterating
|
|
d5cf4665
|
2012-12-19T08:04:31
|
|
Fix some leaks and (possibly) dangling pointers in tests
Also adds some asserts.
|
|
|
96a289f5
|
2012-12-19T05:24:23
|
|
clone-empty-test: Don't use one pointer for two things
... so we can clean up correctly.
|
|
|
3dc0207b
|
2012-12-19T05:21:11
|
|
revwalk-test: Don't leak the second repository
|
|
|
26290cd1
|
2012-12-18T19:52:37
|
|
Reset global variable to NULL after free'ing resource
|
|
|
e62171e2
|
2012-12-17T11:10:25
|
|
Merge pull request #1151 from arrbee/fix-diff-constructor-names
Fix diff constructor names
|
|
|
56c72b75
|
2012-12-17T11:00:53
|
|
Fix diff constructor name order confusion
The diff constructor functions had some confusing names, where the
"old" side of the diff was coming after the "new" side. This
reverses the order in the function name to make it less confusing.
Specifically...
* git_diff_index_to_tree becomes git_diff_tree_to_index
* git_diff_workdir_to_index becomes git_diff_index_to_workdir
* git_diff_workdir_to_tree becomes git_diff_tree_to_workdir
|
|
|
0d10e79d
|
2012-12-17T10:13:36
|
|
Merge pull request #1149 from nulltoken/topic/blob_isbinary
Introduce git_blob_is_binary()
|
|
|
a3337f10
|
2012-12-17T15:15:20
|
|
blob: introduce git_blob_is_binary()
|
|
|
22d23c61
|
2012-12-17T17:15:58
|
|
Cleanup the test correctly
|
|
|
c4e3e797
|
2012-12-16T12:27:11
|
|
Ensure static variables are nulled after every test
|
|
|
a7f125cd
|
2012-12-15T14:56:20
|
|
Fix fetchhead tests
|
|
|
57f5d8dc
|
2012-12-14T14:15:42
|
|
Remove placeholder files during tests
|
|
|
1164acde
|
2012-12-14T14:00:35
|
|
Rebase fixup
|
|
|
850b1edf
|
2012-12-13T12:55:28
|
|
Allow clone to handle empty repos
|
|
|
b9e7e2b4
|
2012-12-14T13:46:45
|
|
Move non-options back out of options struct
|
|
|
18b2d560
|
2012-12-14T13:03:59
|
|
Deploy git_clone_options; remove git_clone_bare
|
|
|
2d466b7d
|
2012-12-14T02:49:11
|
|
tests: Fix unused temp repo
|
|
|
509216a5
|
2012-12-14T02:49:01
|
|
test: Fix clone tests
|
|
|
b0b9fd32
|
2012-12-14T02:41:53
|
|
Merge remote-tracking branch 'origin/clone-auth' into development
|
|
|
8a8820d8
|
2012-12-13T17:58:12
|
|
Add test to clone with absolute path
|
|
|
24393ea6
|
2012-12-13T09:14:56
|
|
Stop premature remote freeing when cloning
|
|
|
7c353afd
|
2012-12-13T08:47:29
|
|
Define constant for default fetch spec
|
|
|
44f36f6e
|
2012-12-12T19:48:44
|
|
Convert clone to use dangling remotes
|
|
|
b914e17d
|
2012-12-12T12:23:24
|
|
API to set a dangling remote's repository
|
|
|
a71c27cc
|
2012-12-12T12:15:25
|
|
Allow creation of dangling remotes
|
|
|
91e7d263
|
2012-12-10T15:29:44
|
|
Fix iterator reset and add reset ranges
The `git_iterator_reset` command has not been working in all cases
particularly when there is a start and end range. This fixes it
and adds tests for it, and also extends it with the ability to
update the start/end range strings when an iterator is reset.
|
|
|
9950d27a
|
2012-12-06T13:26:58
|
|
Clean up iterator APIs
This removes the need to explicitly pass the repo into iterators
where the repo is implied by the other parameters. This moves
the repo to be owned by the parent struct. Also, this has some
iterator related updates to the internal diff API to lay the
groundwork for checkout improvements.
|
|
|
59bccf33
|
2012-12-10T11:11:01
|
|
Add a payload param to git_cred_acquire_cb
Fixes #1128.
|
|
|
72629a10
|
2012-12-10T10:05:31
|
|
Clean up GCC build warnings
|
|
f1c75b94
|
2012-12-07T15:16:41
|
|
tree: relax the filemode parser
There are many different broken filemodes in the wild so we need to
protect against them and give something useful up the chain. Don't
fail when reading a tree from the ODB but normalize the mode as best
we can.
As 664 is no longer a mode that we consider to be valid and gets
normalized to 644, we can stop accepting it in the treebuilder. The
library won't expose it to the user, so any invalid modes are a bug.
|
|
|
a9c07c47
|
2012-12-05T21:06:54
|
|
tests: MSVC fix
|
|
|
bf192cdb
|
2012-12-05T20:56:27
|
|
versions: MSVC build fixes
|
|
|
e05ca13f
|
2012-12-05T11:47:19
|
|
Merge pull request #1115 from ben/struct-versions
Version info for public structs
|
|
|
b2414661
|
2012-11-28T22:43:55
|
|
status should ignore conflicts entries in the index
|
|
|
de70aea6
|
2012-12-03T12:41:50
|
|
Remove GIT_SIGNATURE_VERSION and friends
|
|
|
cc146626
|
2012-11-19T19:00:46
|
|
revparse: Deploy EINVALIDSPEC usage
|
|
|
84166fac
|
2012-11-18T14:20:35
|
|
revparse: remove timezone setup in tests
|
|
|
bc05f30c
|
2012-11-19T18:49:25
|
|
object: refine git_object_peel() error report
|
|
|
62173038
|
2012-11-12T20:47:32
|
|
branch: Deploy EINVALIDSPEC usage
|
|
|
18d6f120
|
2012-11-12T15:55:38
|
|
tag: Deploy EINVALIDSPEC usage
|